Skip to content

Commit e9a83c7

Browse files
committed
[ci] Upgrade macOS CI
1 parent 584f5e3 commit e9a83c7

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

.github/workflows/macos.yml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ concurrency:
88

99
jobs:
1010
macos_testing:
11-
runs-on: macos-13
11+
runs-on: macos-15
1212

1313
steps:
14-
- uses: maxim-lobanov/setup-xcode@v1
15-
with:
16-
xcode-version: '15.2'
14+
# - uses: maxim-lobanov/setup-xcode@v1
15+
# with:
16+
# xcode-version: '15.2'
1717

1818
- name: Setup environment - Brew tap
1919
run: |
@@ -29,10 +29,16 @@ jobs:
2929
brew link --force avr-gcc@14 arm-gcc-bin@14
3030
# brew upgrade boost gcc git cmake || true
3131
32+
- name: Setup Python 3.13
33+
uses: actions/setup-python@v5
34+
with:
35+
python-version: '3.13'
36+
3237
- name: Setup environment - Python pip
3338
run: |
34-
pip3 install --upgrade --upgrade-strategy=eager --break-system-packages modm scons
35-
echo "/usr/local/bin" >> $GITHUB_PATH
39+
python3.13 -m venv .venv
40+
./.venv/bin/pip install --upgrade --upgrade-strategy=eager --break-system-packages modm scons
41+
echo ".venv/bin" >> $GITHUB_PATH
3642
3743
- name: Dump environment
3844
run: |
@@ -62,7 +68,7 @@ jobs:
6268
- name: Hosted Unittests
6369
if: always()
6470
run: |
65-
(cd test && make run-hosted-darwin)
71+
(cd test && make run-hosted-darwin-arm64)
6672
6773
- name: Hosted Examples
6874
if: always()

tools/build_script_generator/make/resources/compiler.mk.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ else
1818
%% if platform == "hosted"
1919
UNAME_S := $(shell uname -s)
2020
ifeq ($(UNAME_S),Darwin)
21-
C_SUFFIX := -12
21+
C_SUFFIX := -14
2222
# Using homebrew include and lib paths on macOS
2323
CPPDEFINES += -I/usr/local/include
2424
LIBPATH += -L/usr/local/lib

0 commit comments

Comments
 (0)