Skip to content

Commit 8d03469

Browse files
mcbartonmcbarton
committed
Update ci.yml to use MacOS 15 for arm osx jobs
1 parent f794dee commit 8d03469

File tree

1 file changed

+39
-34
lines changed

1 file changed

+39
-34
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 39 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -86,40 +86,40 @@ jobs:
8686
cppyy: Off
8787
llvm_enable_projects: "clang"
8888
llvm_targets_to_build: "host;NVPTX"
89-
- name: osx14-arm-clang-clang-repl-19
90-
os: macos-14
89+
- name: osx15-arm-clang-clang-repl-19
90+
os: macos-15
9191
compiler: clang
9292
clang-runtime: '19'
9393
cling: Off
9494
cppyy: On
9595
llvm_enable_projects: "clang;lld"
9696
llvm_targets_to_build: "WebAssembly;host;NVPTX"
97-
- name: osx14-arm-clang-clang-repl-18
98-
os: macos-14
97+
- name: osx15-arm-clang-clang-repl-18
98+
os: macos-15
9999
compiler: clang
100100
clang-runtime: '18'
101101
cling: Off
102102
cppyy: On
103103
llvm_enable_projects: "clang"
104104
llvm_targets_to_build: "host;NVPTX"
105-
- name: osx14-arm-clang-clang-repl-17
106-
os: macos-14
105+
- name: osx15-arm-clang-clang-repl-17
106+
os: macos-15
107107
compiler: clang
108108
clang-runtime: '17'
109109
cling: Off
110110
cppyy: On
111111
llvm_enable_projects: "clang"
112112
llvm_targets_to_build: "host;NVPTX"
113-
- name: osx14-arm-clang-clang-repl-16
114-
os: macos-14
113+
- name: osx15-arm-clang-clang-repl-16
114+
os: macos-15
115115
compiler: clang
116116
clang-runtime: '16'
117117
cling: Off
118118
cppyy: On
119119
llvm_enable_projects: "clang"
120120
llvm_targets_to_build: "host;NVPTX"
121-
- name: osx14-arm-clang-clang13-cling
122-
os: macos-14
121+
- name: osx15-arm-clang-clang13-cling
122+
os: macos-15
123123
compiler: clang
124124
clang-runtime: '13'
125125
cling: On
@@ -292,11 +292,13 @@ jobs:
292292
echo "CXX=g++-${vers}" >> $GITHUB_ENV
293293
else
294294
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
295-
#Use clang-15 and clang++-15 compiler that is installed on runner, instead of one
296-
#provided by MacOS (could brew install clang-16/17 to use consistent version
297-
#of clang)
298-
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
299-
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
295+
if [[ "$ARCHITECHURE" == "arm64" ]]; then
296+
echo "CC=$(brew --prefix llvm@18)/bin/clang" >> $GITHUB_ENV
297+
echo "CXX=$(brew --prefix llvm@18)/bin/clang++" >> $GITHUB_ENV
298+
else
299+
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
300+
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
301+
fi
300302
fi
301303
env:
302304
compiler: ${{ matrix.compiler }}
@@ -345,10 +347,11 @@ jobs:
345347
if: ${{ runner.os == 'macOS' && steps.cache.outputs.cache-hit != 'true' }}
346348
run: |
347349
brew update
348-
brew remove [email protected]
349350
export ARCHITECHURE=$(uname -m)
350351
if [[ "$ARCHITECHURE" != "x86_64" ]]; then
351352
brew remove unxip
353+
else
354+
brew remove [email protected]
352355
fi
353356
# workaround for https://github.com/actions/setup-python/issues/577
354357
for pkg in $(brew list | grep '^python@'); do
@@ -585,32 +588,32 @@ jobs:
585588
# clang-runtime: '17'
586589
# cling: Off
587590
# cppyy: On
588-
- name: osx14-arm-clang-clang-repl-19-cppyy
589-
os: macos-14
591+
- name: osx15-arm-clang-clang-repl-19-cppyy
592+
os: macos-15
590593
compiler: clang
591594
clang-runtime: '19'
592595
cling: Off
593596
cppyy: On
594-
- name: osx14-arm-clang-clang-repl-18-cppyy
595-
os: macos-14
597+
- name: osx15-arm-clang-clang-repl-18-cppyy
598+
os: macos-15
596599
compiler: clang
597600
clang-runtime: '18'
598601
cling: Off
599602
cppyy: On
600-
- name: osx14-arm-clang-clang-repl-17-cppyy
601-
os: macos-14
603+
- name: osx15-arm-clang-clang-repl-17-cppyy
604+
os: macos-15
602605
compiler: clang
603606
clang-runtime: '17'
604607
cling: Off
605608
cppyy: On
606-
- name: osx14-arm-clang-clang-repl-16
607-
os: macos-14
609+
- name: osx15-arm-clang-clang-repl-16
610+
os: macos-15
608611
compiler: clang
609612
clang-runtime: '16'
610613
cling: Off
611614
cppyy: Off
612-
- name: osx14-arm-clang-clang13-cling-cppyy
613-
os: macos-14
615+
- name: osx15-arm-clang-clang13-cling-cppyy
616+
os: macos-15
614617
compiler: clang
615618
clang-runtime: '13'
616619
cling: On
@@ -761,11 +764,13 @@ jobs:
761764
echo "CXX=g++-${vers}" >> $GITHUB_ENV
762765
else
763766
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
764-
#Use clang-15 and clang++-15 compiler that is installed on runner, instead of one
765-
#provided by MacOS (could brew install clang-16/17 to use consistent version
766-
#of clang)
767-
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
768-
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
767+
if [[ "$ARCHITECHURE" == "arm64" ]]; then
768+
echo "CC=$(brew --prefix llvm@18)/bin/clang" >> $GITHUB_ENV
769+
echo "CXX=$(brew --prefix llvm@18)/bin/clang++" >> $GITHUB_ENV
770+
else
771+
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
772+
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
773+
fi
769774
fi
770775
env:
771776
compiler: ${{ matrix.compiler }}
@@ -813,9 +818,9 @@ jobs:
813818
if: runner.os == 'macOS'
814819
run: |
815820
brew update --force
816-
brew remove [email protected]
817821
export ARCHITECHURE=$(uname -m)
818822
if [[ "$ARCHITECHURE" == "x86_64" ]]; then
823+
brew remove [email protected]
819824
brew remove swiftlint
820825
else
821826
brew remove unxip
@@ -1147,8 +1152,8 @@ jobs:
11471152
clang-runtime: '19'
11481153
cling: Off
11491154
micromamba_shell_init: bash
1150-
- name: osx14-arm-clang-clang-repl-19-emscripten_wasm
1151-
os: macos-14
1155+
- name: osx15-arm-clang-clang-repl-19-emscripten_wasm
1156+
os: macos-15
11521157
compiler: clang
11531158
clang-runtime: '19'
11541159
cling: Off

0 commit comments

Comments
 (0)