Skip to content

Commit 6360d57

Browse files
authored
Using llvm 18 for compilation. (due to moving osx arm jobs to osx 15)
1 parent 3657868 commit 6360d57

File tree

1 file changed

+14
-10
lines changed

1 file changed

+14
-10
lines changed

.github/workflows/ci.yml

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -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" != "x86_64" ]]; 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 }}
@@ -762,11 +764,13 @@ jobs:
762764
echo "CXX=g++-${vers}" >> $GITHUB_ENV
763765
else
764766
echo "SDKROOT=$(xcrun --sdk macosx --show-sdk-path)" >> $GITHUB_ENV
765-
#Use clang-15 and clang++-15 compiler that is installed on runner, instead of one
766-
#provided by MacOS (could brew install clang-16/17 to use consistent version
767-
#of clang)
768-
echo "CC=$(brew --prefix llvm@15)/bin/clang" >> $GITHUB_ENV
769-
echo "CXX=$(brew --prefix llvm@15)/bin/clang++" >> $GITHUB_ENV
767+
if [[ "$ARCHITECHURE" != "x86_64" ]]; 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
770774
fi
771775
env:
772776
compiler: ${{ matrix.compiler }}

0 commit comments

Comments
 (0)