Skip to content

Commit 26ed771

Browse files
committed
[ci] Fix macOS CI already having cmake installed
1 parent 5f8a558 commit 26ed771

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

.github/workflows/macos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
export HOMEBREW_NO_INSTALL_CLEANUP=1 # saves time
2626
brew update
2727
# brew unlink gcc
28-
brew install doxygen boost gcc@14 avr-gcc@14 arm-gcc-bin@14 cmake || true
28+
brew install doxygen boost gcc@14 avr-gcc@14 arm-gcc-bin@14 || true
2929
brew link --force avr-gcc@14 arm-gcc-bin@14
30-
# brew upgrade boost gcc git || true
30+
# brew upgrade boost gcc git cmake || true
3131
3232
- name: Setup environment - Python pip
3333
run: |

tools/build_script_generator/scons/resources/SConscript.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ env["COMPILERPREFIX"] = "avr-"
2222
env["COMPILERPREFIX"] = "arm-none-eabi-"
2323
%% endif
2424
%% if family == "darwin"
25-
# Using homebrew gcc-14 on macOS instead of clang
26-
env["COMPILERSUFFIX"] = "-14"
25+
# Using homebrew gcc on macOS instead of clang
26+
env["COMPILERSUFFIX"] = env.Detect(["gcc-14", "gcc-15"])[3:]
2727
%% endif
2828
%% endif
2929

0 commit comments

Comments
 (0)