diff --git a/.circleci/config.yml b/.circleci/config.yml index eaec4fc3..557a5185 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -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: | @@ -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: diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 5396d2fa..3d2e6485 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -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 diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml index 96319aea..80aa5707 100644 --- a/.github/workflows/build-ubuntu.yml +++ b/.github/workflows/build-ubuntu.yml @@ -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 diff --git a/.github/workflows/build-windows-hosted.yml b/.github/workflows/build-windows-hosted.yml index c4432305..18a63a59 100644 --- a/.github/workflows/build-windows-hosted.yml +++ b/.github/workflows/build-windows-hosted.yml @@ -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" @@ -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 @@ -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 diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index 78605cca..0fb7bd78 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -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 diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8a14cc29..8e3ae1fe 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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" @@ -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)" @@ -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)"