Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions .github/workflows/macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ concurrency:

jobs:
macos_testing:
runs-on: macos-13
runs-on: macos-15

steps:
- uses: maxim-lobanov/setup-xcode@v1
with:
xcode-version: '15.2'
# - uses: maxim-lobanov/setup-xcode@v1
# with:
# xcode-version: '15.2'

- name: Setup environment - Brew tap
run: |
Expand All @@ -29,10 +29,16 @@ jobs:
brew link --force avr-gcc@14 arm-gcc-bin@14
# brew upgrade boost gcc git cmake || true

- name: Setup Python 3.13
uses: actions/setup-python@v5
with:
python-version: '3.13'

- name: Setup environment - Python pip
run: |
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm scons
echo "/usr/local/bin" >> $GITHUB_PATH
python3.13 -m venv .venv
./.venv/bin/pip install --upgrade --upgrade-strategy=eager --break-system-packages modm scons
echo ".venv/bin" >> $GITHUB_PATH

- name: Dump environment
run: |
Expand Down Expand Up @@ -62,7 +68,7 @@ jobs:
- name: Hosted Unittests
if: always()
run: |
(cd test && make run-hosted-darwin)
(cd test && make run-hosted-darwin-arm64)

- name: Hosted Examples
if: always()
Expand Down
2 changes: 1 addition & 1 deletion tools/build_script_generator/make/resources/compiler.mk.in
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ else
%% if platform == "hosted"
UNAME_S := $(shell uname -s)
ifeq ($(UNAME_S),Darwin)
C_SUFFIX := -12
C_SUFFIX := -14
# Using homebrew include and lib paths on macOS
CPPDEFINES += -I/usr/local/include
LIBPATH += -L/usr/local/lib
Expand Down
Loading