Skip to content

Commit aea306e

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

File tree

2 files changed

+35
-8
lines changed

2 files changed

+35
-8
lines changed

.github/workflows/cd.yml

Lines changed: 29 additions & 5 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/
@@ -100,10 +101,18 @@ jobs:
100101
run: |
101102
conan install . --output-folder build --build=missing -o include_messaging=False
102103
103-
- name: Install Dependencies through Conan on MacOS
104-
if: matrix.platform == 'macos-13' || matrix.platform == 'macos-latest'
104+
- name: Install Dependencies through Conan on ARM MacOS
105+
if: matrix.platform == 'macos-latest'
106+
shell: bash
107+
run: |
108+
conan install . --output-folder build --build=missing
109+
110+
- name: Install Dependencies through Conan on Intel MacOS
111+
if: matrix.platform == 'macos-13'
105112
shell: bash
106113
run: |
114+
CC=$(brew --prefix llvm)/bin/clang \
115+
CXX=$(brew --prefix llvm)/bin/clang++ \
107116
conan install . --output-folder build --build=missing
108117
109118
- name: Install Dependencies through Conan on Linux <x86_64>
@@ -139,16 +148,31 @@ jobs:
139148
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
140149
cmake --build . --config Release
141150
142-
- name: Build Unix
143-
if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-13' || matrix.platform == 'macos-latest'
151+
- name: Build Non-Intel-Mac Unix
152+
if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-latest'
144153
run: |
145154
echo "working dir is $PWD"
146-
147155
cd build
148156
source conanbuild.sh
149157
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
150158
cmake --build . --config Release
151159
160+
- name: Build Intel Mac
161+
if: matrix.platform == 'macos-13'
162+
run: |
163+
echo "working dir is $PWD"
164+
cd build
165+
source conanbuild.sh
166+
CC=$(brew --prefix llvm)/bin/clang \
167+
CXX=$(brew --prefix llvm)/bin/clang++ \
168+
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release \
169+
-DCMAKE_C_COMPILER=/usr/local/opt/llvm/bin/clang \
170+
-DCMAKE_CXX_COMPILER=/usr/local/opt/llvm/bin/clang++ \
171+
-DCMAKE_AR=/usr/local/opt/llvm/bin/llvm-ar \
172+
-DCMAKE_RANLIB=/usr/local/opt/llvm/bin/llvm-ranlib \
173+
-DCMAKE_LINKER=/usr/local/opt/llvm/bin/ld.lld
174+
cmake --build . --config Release
175+
152176
- name: Test Windows
153177
if: matrix.platform == 'windows-latest' || matrix.platform == 'windows-11-arm'
154178
run: |
Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
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
8-
os=Macos
7+
compiler.version=19
8+
os=Macos
9+
10+
[conf]
11+
tools.build:compiler_executables={"c": "/usr/local/opt/llvm/bin/clang", "cpp": "/usr/local/opt/llvm/bin/clang++"}

0 commit comments

Comments
 (0)