Skip to content

Commit e648b37

Browse files
committed
ci: update osx image
1 parent 04fc98e commit e648b37

File tree

2 files changed

+8
-12
lines changed

2 files changed

+8
-12
lines changed

.github/workflows/cmake-tag.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,10 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
os: [ubuntu-24.04, windows-latest, macos-12]
18+
os: [ubuntu-24.04, windows-latest, macos-15]
1919
include:
2020
- os: ubuntu-24.04
2121
cmake: /usr/bin/env CC=gcc-14 CXX=g++-14 cmake
22-
- os: macos-12
23-
cmake: /usr/bin/env CC="$(brew --prefix llvm@17)/bin/clang" CXX="$(brew --prefix llvm@17)/bin/clang++" cmake
2422
- os: windows-latest
2523
cmake: .\.github\workflows\build-windows.bat cmake
2624

@@ -45,8 +43,8 @@ jobs:
4543

4644
- name: Install OSX dependencies
4745
run: |
48-
brew install SDL2 llvm@17
49-
if: matrix.os == 'macos-12'
46+
brew install SDL2 llvm@19
47+
if: matrix.os == 'macos-15'
5048

5149
- name: Configure
5250
run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

.github/workflows/cmake.yml

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,13 @@ jobs:
1515
strategy:
1616
fail-fast: true
1717
matrix:
18-
#os: [ubuntu-24.04, windows-latest, macos-12]
18+
#os: [ubuntu-24.04, windows-latest, macos-15]
1919
os: [ubuntu-24.04]
2020
include:
2121
- os: ubuntu-24.04
2222
cmake: /usr/bin/env CC=gcc-14 CXX=g++-14 cmake
23-
#- os: macos-12
24-
# cmake: /usr/bin/env CC="$(brew --prefix llvm@16)/bin/clang" CXX="$(brew --prefix llvm@16)/bin/clang++" cmake
25-
#- os: windows-latest
26-
# cmake: .\.github\workflows\build-windows.bat cmake
23+
- os: windows-latest
24+
cmake: .\.github\workflows\build-windows.bat cmake
2725

2826
steps:
2927
- uses: actions/checkout@v3
@@ -46,8 +44,8 @@ jobs:
4644

4745
- name: Install OSX dependencies
4846
run: |
49-
brew install SDL2 llvm@16
50-
if: matrix.os == 'macos-12'
47+
brew install SDL2 llvm@19
48+
if: matrix.os == 'macos-15'
5149

5250
- name: Configure
5351
run: ${{matrix.cmake}} -G "Ninja" -S ${{github.workspace}}/ -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}

0 commit comments

Comments
 (0)