Skip to content

Commit 9daf189

Browse files
author
Dextinfire
committed
Update runner os and try to fix vcpkg cache
1 parent ee12ec7 commit 9daf189

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

.github/workflows/pipeline.yml

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -74,15 +74,15 @@ jobs:
7474
fail-fast: false
7575
matrix:
7676
include:
77-
- os: windows-latest
77+
- os: windows-2025
7878
os_name: windows
7979
triplet: x64-windows-release
8080
host_triplet: x64-windows-release
8181
- os: ubuntu-24.04
8282
os_name: linux
8383
triplet: x64-linux-ci
8484
host_triplet: x64-linux-ci
85-
- os: macos-latest
85+
- os: macos-14
8686
os_name: macos-arm64
8787
triplet: arm64-osx-ci
8888
host_triplet: arm64-osx-ci
@@ -127,12 +127,11 @@ jobs:
127127

128128
- uses: lukka/get-cmake@latest
129129

130-
- name: 'Restore vcpkg cache'
131-
uses: actions/cache/restore@v4
132-
id: vcpkgcache
130+
- name: 'VCPKG Cache'
131+
uses: actions/cache@v4
133132
with:
134133
path: "${{ github.workspace }}/.vcpkg_cache"
135-
key: vcpkg-${{ matrix.triplet }}-${{ hashFiles('**/vcpkg.json', 'vcpkg-configuration.json', 'triplets/**', 'portfiles/**') }}
134+
key: vcpkg-${{ matrix.triplet }}-${{ env.vcpkgCommitId }}-${{ matrix.os }}-${{ hashFiles('**/vcpkg.json', 'vcpkg-configuration.json', 'triplets/**', 'portfiles/**') }}
136135

137136
- name: Setup vcpkg
138137
uses: lukka/run-vcpkg@v11
@@ -161,11 +160,6 @@ jobs:
161160
'-DVCPKG_HOST_TRIPLET=${{ matrix.host_triplet }}',
162161
]
163162
buildPreset: ${{ env.PresetName }}
164-
- name: Save vcpkg cache
165-
uses: actions/cache/save@v4
166-
with:
167-
path: "${{ github.workspace }}/.vcpkg_cache"
168-
key: ${{ steps.vcpkgcache.outputs.cache-primary-key }}
169163
- name: Copy docs
170164
run: |
171165
mkdir -p "${{ github.workspace }}/release/${{ env.PresetName }}"

0 commit comments

Comments
 (0)