Skip to content

Commit

Permalink
ci: update cache keys to 2447
Browse files Browse the repository at this point in the history
  • Loading branch information
luncliff committed Nov 24, 2024
1 parent c1b1823 commit f843e60
Show file tree
Hide file tree
Showing 6 changed files with 16 additions and 22 deletions.
10 changes: 5 additions & 5 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ jobs:
VCPKG_ROOT: /tmp/vcpkg
- restore_cache:
keys:
- v2445-android-{{ checksum ".circleci/config.yml" }}
- v2445-android-{{ .Branch }}
- v2445-android-main
- v2447-android-{{ checksum ".circleci/config.yml" }}
- v2447-android-{{ .Branch }}
- v2447-android-main
- run:
name: "Install: port-android.txt"
command: |
Expand All @@ -67,11 +67,11 @@ jobs:
VCPKG_MAX_CONCURRENCY: 2
no_output_timeout: 1h
- save_cache:
key: v2445-android-{{ .Branch }}
key: v2447-android-{{ .Branch }}
paths:
- /tmp/vcpkg-caches
- save_cache:
key: v2445-android-{{ checksum ".circleci/config.yml" }}
key: v2447-android-{{ checksum ".circleci/config.yml" }}
paths:
- /tmp/vcpkg-caches
- store_artifacts:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:

- uses: actions/cache@v4.1.2
with:
key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
key: "v2447-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
path: |
${{ runner.temp }}/vcpkg-downloads
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- uses: actions/cache@v4.1.2
with:
key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
key: "v2447-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
path: |
${{ runner.temp }}/vcpkg-downloads
Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/build-windows-hosted.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,12 @@ jobs:
strategy:
matrix:
include:
- vcpkg_tag: "2024.07.12"
vcpkg_commit: "1de2026f28ead93ff1773e6e680387643e914ea1"
- vcpkg_tag: "2024.08.23"
vcpkg_commit: "3508985146f1b1d248c67ead13f8f54be5b4f5da"
- vcpkg_tag: "2024.09.30"
vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
- vcpkg_tag: "2024.10.21"
vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
- vcpkg_tag: "2024.11.16"
vcpkg_commit: "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
fail-fast: false
env:
VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
Expand Down Expand Up @@ -103,8 +101,6 @@ jobs:
strategy:
matrix:
include:
- vcpkg_tag: "2024.09.30"
vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
- vcpkg_tag: "2024.10.21"
vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
fail-fast: false
Expand Down Expand Up @@ -166,8 +162,6 @@ jobs:
strategy:
matrix:
include:
- vcpkg_tag: "2024.09.30"
vcpkg_commit: "c82f74667287d3dc386bce81e44964370c91a289"
- vcpkg_tag: "2024.10.21"
vcpkg_commit: "10b7a178346f3f0abef60cecd5130e295afd8da4"
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:

- uses: actions/cache@v4.1.2
with:
key: "v2432-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
key: "v2447-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
path: |
${{ runner.temp }}/vcpkg-downloads
Expand Down
12 changes: 6 additions & 6 deletions azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ stages:
- powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
- task: Cache@2
inputs:
key: '"v2445-bin-uwp" | "$(vcpkg.default.triplet)"'
key: '"v2447-bin-uwp" | "$(vcpkg.default.triplet)"'
restoreKeys: |
"v2445-bin-uwp" | "$(vcpkg.default.triplet)"
"v2447-bin-uwp" | "$(vcpkg.default.triplet)"
path: $(vcpkg.default.binary.cache)
- task: PowerShell@2
displayName: "Test: arm64-uwp"
Expand Down Expand Up @@ -114,9 +114,9 @@ stages:
- powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
- task: Cache@2
inputs:
key: '"v2445-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
key: '"v2447-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
restoreKeys: |
"v2445-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
"v2447-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
path: $(vcpkg.default.binary.cache)
- task: PowerShell@2
displayName: "Test: $(cxx)"
Expand Down Expand Up @@ -172,9 +172,9 @@ stages:
displayName: "Setup vcpkg"
- task: Cache@2
inputs:
key: '"v2445-bin-ios" | "$(vcpkg.default.triplet)"'
key: '"v2447-bin-ios" | "$(vcpkg.default.triplet)"'
restoreKeys: |
"v2445-bin-ios" | "$(vcpkg.default.triplet)"
"v2447-bin-ios" | "$(vcpkg.default.triplet)"
path: $(vcpkg.default.binary.cache)
- task: PowerShell@2
displayName: "Test: $(vcpkg.default.triplet)"
Expand Down

0 comments on commit f843e60

Please sign in to comment.