Skip to content

Commit 131f01f

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

File tree

2 files changed

+30
-8
lines changed

2 files changed

+30
-8
lines changed

.github/workflows/cd.yml

Lines changed: 24 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,12 +101,20 @@ 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'
105106
shell: bash
106107
run: |
107108
conan install . --output-folder build --build=missing
108109
110+
- name: Install Dependencies through Conan on Intel MacOS
111+
if: matrix.platform == 'macos-13'
112+
shell: bash
113+
run: |
114+
CC=$(brew --prefix llvm)/bin/clang \
115+
CXX=$(brew --prefix llvm)/bin/clang++ \
116+
conan install . --output-folder build --build=missing
117+
109118
- name: Install Dependencies through Conan on Linux <x86_64>
110119
if: matrix.platform == 'ubuntu-latest'
111120
shell: bash
@@ -139,13 +148,23 @@ 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'
153+
run: |
154+
echo "working dir is $PWD"
155+
cd build
156+
source conanbuild.sh
157+
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
158+
cmake --build . --config Release
159+
160+
- name: Build Intel Mac
161+
if: matrix.platform == 'macos-13'
144162
run: |
145163
echo "working dir is $PWD"
146-
147164
cd build
148165
source conanbuild.sh
166+
CC=$(brew --prefix llvm)/bin/clang \
167+
CXX=$(brew --prefix llvm)/bin/clang++ \
149168
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
150169
cmake --build . --config Release
151170
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)