Skip to content

Commit b71b5a8

Browse files
intel mac apple-clang too outdated; attempting classic llvm build
1 parent 45c587c commit b71b5a8

File tree

2 files changed

+16
-5
lines changed

2 files changed

+16
-5
lines changed

.github/workflows/cd.yml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ jobs:
5454
if: matrix.platform == 'macos-13'
5555
shell: bash
5656
run: |
57+
brew install llvm
5758
python3 -m pip install conan
5859
conan --version
5960
mkdir -p ~/.conan2/profiles/
@@ -139,13 +140,23 @@ jobs:
139140
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
140141
cmake --build . --config Release
141142
142-
- name: Build Unix
143-
if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-13' || matrix.platform == 'macos-latest'
143+
- name: Build Non-Intel-Mac Unix
144+
if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-latest'
145+
run: |
146+
echo "working dir is $PWD"
147+
cd build
148+
source conanbuild.sh
149+
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
150+
cmake --build . --config Release
151+
152+
- name: Build Intel Mac
153+
if: matrix.platform == 'macos-13'
144154
run: |
145155
echo "working dir is $PWD"
146-
147156
cd build
148157
source conanbuild.sh
158+
CC=$(brew --prefix llvm)/bin/clang \
159+
CXX=$(brew --prefix llvm)/bin/clang++ \
149160
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
150161
cmake --build . --config Release
151162
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
[settings]
22
arch=x86_64
33
build_type=Release
4-
compiler=apple-clang
4+
compiler=clang
55
compiler.cppstd=20
66
compiler.libcxx=libc++
7-
compiler.version=15
7+
compiler.version=19
88
os=Macos

0 commit comments

Comments
 (0)