@@ -22,22 +22,22 @@ jobs:
2222 fail-fast : false
2323 matrix :
2424 include :
25- - name : osx15 -arm-clang-clang-repl-19
26- os : macos-15
25+ - name : osx26 -arm-clang-clang-repl-19
26+ os : macos-26
2727 compiler : clang
2828 clang-runtime : ' 19'
2929 cling : Off
3030 llvm_enable_projects : " clang"
3131 llvm_targets_to_build : " host"
32- - name : osx15 -arm-clang-clang-repl-18
33- os : macos-15
32+ - name : osx26 -arm-clang-clang-repl-18
33+ os : macos-26
3434 compiler : clang
3535 clang-runtime : ' 18'
3636 cling : Off
3737 llvm_enable_projects : " clang"
3838 llvm_targets_to_build : " host"
39- - name : osx15 -arm-clang-clang18-cling
40- os : macos-15
39+ - name : osx26 -arm-clang-clang18-cling
40+ os : macos-26
4141 compiler : clang
4242 clang-runtime : ' 18'
4343 cling : On
@@ -116,22 +116,23 @@ jobs:
116116 echo "CODE_COVERAGE=0" >> $GITHUB_ENV
117117 echo "ncpus=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
118118
119- - name : Setup compiler
120- if : ${{ steps.cache.outputs.cache-hit != 'true' }}
119+ - name : Setup Compiler on MacOS
120+ if : runner.os == 'macOS'
121+ shell : bash
121122 run : |
122123 vers="${compiler#*-}"
123124 if [[ "${{ matrix.compiler }}" == *"gcc"* ]]; then
124125 brew install "gcc@$vers"
125126 echo "CC=gcc-${vers}" >> $GITHUB_ENV
126127 echo "CXX=g++-${vers}" >> $GITHUB_ENV
127128 else
128- brew install llvm@15
129129 if [[ "$(uname -m)" == "x86_64" ]]; then
130+ brew install llvm@15
130131 echo "CC=/usr/local/opt/llvm@15/bin/clang" >> $GITHUB_ENV
131132 echo "CXX=/usr/local/opt/llvm@15/bin/clang++" >> $GITHUB_ENV
132133 else
133- echo "CC=/opt/homebrew/opt/llvm@15 /bin/clang" >> $GITHUB_ENV
134- echo "CXX=/opt/homebrew/opt/llvm@15 /bin/clang++" >> $GITHUB_ENV
134+ echo "CC=/opt/homebrew/opt/llvm@20 /bin/clang" >> $GITHUB_ENV
135+ echo "CXX=/opt/homebrew/opt/llvm@20 /bin/clang++" >> $GITHUB_ENV
135136 fi
136137 fi
137138 echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
@@ -250,20 +251,20 @@ jobs:
250251 fail-fast : false
251252 matrix :
252253 include :
253- - name : osx15 -arm-clang-clang-repl-19-cppyy
254- os : macos-15
254+ - name : osx26 -arm-clang-clang-repl-19-cppyy
255+ os : macos-26
255256 compiler : clang
256257 clang-runtime : ' 19'
257258 cling : Off
258259 cppyy : On
259- - name : osx15 -arm-clang-clang-repl-18-cppyy
260- os : macos-15
260+ - name : osx26 -arm-clang-clang-repl-18-cppyy
261+ os : macos-26
261262 compiler : clang
262263 clang-runtime : ' 18'
263264 cling : Off
264265 cppyy : On
265- - name : osx15 -arm-clang-clang18-cling-cppyy
266- os : macos-15
266+ - name : osx26 -arm-clang-clang18-cling-cppyy
267+ os : macos-26
267268 compiler : clang
268269 clang-runtime : ' 18'
269270 cling : On
@@ -343,21 +344,23 @@ jobs:
343344 echo "CODE_COVERAGE=0" >> $GITHUB_ENV
344345 echo "ncpus=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
345346
346- - name : Setup compiler
347+ - name : Setup Compiler on MacOS
348+ if : runner.os == 'macOS'
349+ shell : bash
347350 run : |
348351 vers="${compiler#*-}"
349352 if [[ "${{ matrix.compiler }}" == *"gcc"* ]]; then
350353 brew install "gcc@$vers"
351354 echo "CC=gcc-${vers}" >> $GITHUB_ENV
352355 echo "CXX=g++-${vers}" >> $GITHUB_ENV
353356 else
354- brew install llvm@15
355357 if [[ "$(uname -m)" == "x86_64" ]]; then
358+ brew install llvm@15
356359 echo "CC=/usr/local/opt/llvm@15/bin/clang" >> $GITHUB_ENV
357360 echo "CXX=/usr/local/opt/llvm@15/bin/clang++" >> $GITHUB_ENV
358361 else
359- echo "CC=/opt/homebrew/opt/llvm@15 /bin/clang" >> $GITHUB_ENV
360- echo "CXX=/opt/homebrew/opt/llvm@15 /bin/clang++" >> $GITHUB_ENV
362+ echo "CC=/opt/homebrew/opt/llvm@20 /bin/clang" >> $GITHUB_ENV
363+ echo "CXX=/opt/homebrew/opt/llvm@20 /bin/clang++" >> $GITHUB_ENV
361364 fi
362365 fi
363366 echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
0 commit comments