ci: update cache key to v2404

luncliff · Jan 25, 2024 · 0c8c9af · 0c8c9af
1 parent 18f333a
commit 0c8c9af
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 21 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -50,9 +50,9 @@ jobs:
             Pop-Location
       - restore_cache:
           keys:
-            - v2352-caches-{{ .Branch }}
-            - v2352-caches-{{ checksum ".circleci/config.yml" }}
-            - v2352-caches-update/circleci
+            - v2404-caches-{{ .Branch }}
+            - v2404-caches-{{ checksum ".circleci/config.yml" }}
+            - v2404-caches-main
             - v2352-caches-main
       - run:
           name: "Install: port-windows.txt"
@@ -72,15 +72,15 @@ jobs:
             equal: [ main, << pipeline.git.branch >> ]
           steps:
            - save_cache:
-              key: v2352-caches-main
+              key: v2404-caches-main
               paths:
                 - C:/vcpkg-caches
       - save_cache:
-          key: v2352-caches-{{ .Branch }}
+          key: v2404-caches-{{ .Branch }}
           paths:
             - C:/vcpkg-caches
       - save_cache:
-          key: v2352-caches-{{ checksum ".circleci/config.yml" }}
+          key: v2404-caches-{{ checksum ".circleci/config.yml" }}
           paths:
             - C:/vcpkg-caches
       - store_artifacts:

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -32,7 +32,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          key: "v2352-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
+          key: "v2404-${{ runner.os }}-${{ matrix.vcpkg_tag }}"
           path: |
             /usr/local/share/vcpkg-downloads
             /usr/local/share/vcpkg-archives

diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          key: "v2352-x64-linux-${{ matrix.vcpkg_tag }}"
+          key: "v2404-x64-linux-${{ matrix.vcpkg_tag }}"
           path: |
             ${{ runner.temp }}/vcpkg-downloads
             ${{ runner.temp }}/vcpkg-archives

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -36,7 +36,7 @@ jobs:
 
       - uses: actions/[email protected]
         with:
-          key: "v2352-x64-windows-${{ matrix.vcpkg_tag }}"
+          key: "v2404-x64-windows-${{ matrix.vcpkg_tag }}"
           path: |
             C:/vcpkg/downloads
             C:/vcpkg/archives

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -74,8 +74,9 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2403-bin-mac-host"'
+              key: '"v2404-bin-mac-host"'
               restoreKeys: |
+                "v2404-bin-mac-host"
                 "v2403-bin-mac-host"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
@@ -116,14 +117,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2403-down-uwp"'
+              key: '"v2404-down-uwp"'
               restoreKeys: |
+                "v2404-down-uwp"
                 "v2403-down-uwp"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2403-bin-uwp" | "$(vcpkg.default.triplet)"'
+              key: '"v2404-bin-uwp" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2404-bin-uwp" | "$(vcpkg.default.triplet)"
                 "v2403-bin-uwp" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
@@ -172,14 +175,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2403-down-ubuntu"'
+              key: '"v2404-down-ubuntu"'
               restoreKeys: |
+                "v2404-down-ubuntu"
                 "v2403-down-ubuntu"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2403-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
+              key: '"v2404-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
               restoreKeys: |
+                "v2404-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
                 "v2403-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
@@ -219,14 +224,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2403-down-android"'
+              key: '"v2404-down-android"'
               restoreKeys: |
+                "v2404-down-android"
                 "v2403-down-android"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2403-bin-android" | "$(vcpkg.default.triplet)"'
+              key: '"v2404-bin-android" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2404-bin-android" | "$(vcpkg.default.triplet)"
                 "v2403-bin-android" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
@@ -276,14 +283,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2403-down-apple"'
+              key: '"v2404-down-apple"'
               restoreKeys: |
+                "v2404-down-apple"
                 "v2403-down-apple"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2403-bin-osx" | "$(vcpkg.default.triplet)"'
+              key: '"v2404-bin-osx" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2404-bin-osx" | "$(vcpkg.default.triplet)"
                 "v2403-bin-osx" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
@@ -321,14 +330,16 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"v2403-down-apple"'
+              key: '"v2404-down-apple"'
               restoreKeys: |
+                "v2404-down-apple"
                 "v2403-down-apple"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"v2403-bin-ios" | "$(vcpkg.default.triplet)"'
+              key: '"v2404-bin-ios" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
+                "v2404-bin-ios" | "$(vcpkg.default.triplet)"
                 "v2403-bin-ios" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0

diff --git a/test/vcpkg.json b/test/vcpkg.json
@@ -37,7 +37,13 @@
       "name": "metal-cpp",
       "platform": "osx | ios"
     },
-    "openssl3",
+    {
+      "name": "openssl3",
+      "features": [
+        "tools"
+      ],
+      "platform": "windows | linux"
+    },
     "rvo2",
     "rvo2-3d",
     {