Skip to content

Commit

Permalink
ci: use the pre-installed cmake on macos-14
Browse files Browse the repository at this point in the history
  • Loading branch information
aminya committed Sep 10, 2024
1 parent 9c59e3c commit d46a234
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,11 @@ jobs:
compiler:
- llvm
- gcc
cmake:
- true
vcvarsall:
- true
include:
- os: "windows-2022"
compiler: "msvc"
cmake: true
vcvarsall: true
- os: "windows-2022"
compiler: "msvc"
Expand All @@ -55,7 +52,7 @@ jobs:
${{ env.XDG_CACHE_HOME }}/vcpkg/archives
${{ env.LOCALAPPDATA }}\vcpkg\archives
${{ env.APPDATA }}\vcpkg\archives
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}-${{ matrix.cmake }}
key: ${{ runner.os }}-${{ matrix.compiler }}-${{ env.BUILD_TYPE }}-${{ hashFiles('**/CMakeLists.txt', './vcpkg.json')}}
restore-keys: |
${{ runner.os }}-${{ env.BUILD_TYPE }}-
Expand All @@ -64,7 +61,7 @@ jobs:
with:
compiler: ${{ matrix.compiler }}
vcvarsall: ${{ contains(matrix.os, 'windows') && matrix.vcvarsall }}
cmake: ${{ matrix.cmake }}
cmake: ${{ !contains(matrix.os, 'macos-14') }}
ninja: true
vcpkg: true
conan: 2.6.0
Expand Down

0 comments on commit d46a234

Please sign in to comment.