Skip to content

Commit 2ded3e3

Browse files
intel mac 13 too old; upgrading to MacOS15!
1 parent 3a0cdb3 commit 2ded3e3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

.github/workflows/cd.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
if: matrix.platform == 'macos-15-intel'
5555
shell: bash
5656
run: |
57-
python3 -m pip install conan
57+
brew install conan
5858
conan --version
5959
mkdir -p ~/.conan2/profiles/
6060
touch ~/.conan2/profiles/default # if we don't make a file first, cp thinks its a folder that doesn't exist
@@ -139,7 +139,7 @@ jobs:
139139
cmake -B . -S .. -G "Ninja" -DCMAKE_TOOLCHAIN_FILE="conan_toolchain.cmake" -DCMAKE_BUILD_TYPE=Release
140140
cmake --build . --config Release
141141
142-
- name: Build Unix
142+
- name: Build Non-Intel-Mac Unix
143143
if: matrix.platform == 'ubuntu-latest' || matrix.platform == 'ubuntu-24.04-arm' || matrix.platform == 'macos-15-intel' || matrix.platform == 'macos-latest'
144144
run: |
145145
echo "working dir is $PWD"

conan-profiles/CI-CD/MacOS-AMD64_profile.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ build_type=Release
44
compiler=apple-clang
55
compiler.cppstd=20
66
compiler.libcxx=libc++
7-
compiler.version=15
7+
compiler.version=17
88
os=Macos

0 commit comments

Comments
 (0)