Skip to content

Commit d46a234

Browse files
committed
ci: use the pre-installed cmake on macos-14
1 parent 9c59e3c commit d46a234

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,11 @@ jobs:
2121
compiler:
2222
- llvm
2323
- gcc
24-
cmake:
25-
- true
2624
vcvarsall:
2725
- true
2826
include:
2927
- os: "windows-2022"
3028
compiler: "msvc"
31-
cmake: true
3229
vcvarsall: true
3330
- os: "windows-2022"
3431
compiler: "msvc"
@@ -55,7 +52,7 @@ jobs:
5552
${{ env.XDG_CACHE_HOME }}/vcpkg/archives
5653
${{ env.LOCALAPPDATA }}\vcpkg\archives
5754
${{ env.APPDATA }}\vcpkg\archives
58-
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}-${{ matrix.cmake }}
55+
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}
5956
restore-keys: |
6057
${{ runner.os }}-${{ env.BUILD_TYPE }}-
6158
@@ -64,7 +61,7 @@ jobs:
6461
with:
6562
compiler: ${{ matrix.compiler }}
6663
vcvarsall: ${{ contains(matrix.os, 'windows') && matrix.vcvarsall }}
67-
cmake: ${{ matrix.cmake }}
64+
cmake: ${{ !contains(matrix.os, 'macos-14') }}
6865
ninja: true
6966
vcpkg: true
7067
conan: 2.6.0

0 commit comments

Comments
 (0)