ci: change cache paths, keys

* circleci: fix cache path, keys * gh-actions: change cache key * azure-pipeliens: change cache key
luncliff · Sep 28, 2023 · db6e7bd · db6e7bd
1 parent 7994935
commit db6e7bd
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 31 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -45,9 +45,11 @@ jobs:
             Pop-Location
       - restore_cache:
           keys:
+            - v2338-downs-{{ .Branch }}
             - v2338-downs-{{ checksum ".circleci/config.yml" }}
       - restore_cache:
           keys:
+            - v2338-bins-{{ .Branch }}
             - v2338-bins-{{ checksum ".circleci/config.yml" }}
       - run:
           name: "Install: port-setup.txt"
@@ -58,6 +60,7 @@ jobs:
               --overlay-ports="$env:CIRCLE_WORKING_DIRECTORY/ports" `
               $(Get-Content "$env:CIRCLE_WORKING_DIRECTORY/.circleci/port-setup.txt")
           working_directory: vcpkg
+          no_output_timeout: 1h
       - save_cache:
           key: v2338-downs-{{ checksum ".circleci/config.yml" }}
           paths:
@@ -112,7 +115,7 @@ jobs:
             equal: [ main, << pipeline.git.branch >> ]
           steps:
            - save_cache:
-              key: v2338-bins-{{ .Branch }}
+              key: v2338-bins-{{ checksum ".circleci/config.yml" }}
               paths:
                 - C:/vcpkg-bins
       - save_cache:

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -13,7 +13,7 @@ jobs:
         triplet: [x64-osx, arm64-ios]
     env:
       VCPKG_DOWNLOADS: "/usr/local/share/vcpkg-downloads"
-      VCPKG_DEFAULT_BINARY_CACHE: "/usr/local/share/vcpkg-downloads"
+      VCPKG_DEFAULT_BINARY_CACHE: "/usr/local/share/vcpkg-archives"
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
     steps:
@@ -24,9 +24,10 @@ jobs:
           mkdir -p ${VCPKG_DEFAULT_BINARY_CACHE}
       - uses: actions/cache@v3
         with:
-          key: "vcpkg-2023.08-${{ runner.os }}"
+          key: "v2338-${{ runner.os }}"
           path: |
             /usr/local/share/vcpkg-downloads
+            /usr/local/share/vcpkg-archives
       - uses: ConorMacBride/install-package@v1
         with:
           brew: ninja autoconf automake libtool

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -12,7 +12,7 @@ jobs:
       matrix:
         triplet: [x64-windows]
     env:
-      VCPKG_DOWNLOADS: "C:/vcpkg/archives"
+      VCPKG_DOWNLOADS: "C:/vcpkg/downloads"
       VCPKG_DEFAULT_BINARY_CACHE: "C:/vcpkg/archives"
       VCPKG_OVERLAY_PORTS: "${{ github.workspace }}/ports"
       VCPKG_OVERLAY_TRIPLETS: ${{ github.workspace }}/triplets
@@ -24,8 +24,9 @@ jobs:
           New-Item -Type Directory -Force ${env:VCPKG_DEFAULT_BINARY_CACHE}
       - uses: actions/cache@v3
         with:
-          key: "vcpkg-2023.08-${{ runner.os }}"
+          key: "v2338-${{ runner.os }}"
           path: |
+            C:/vcpkg/downloads
             C:/vcpkg/archives
       - uses: microsoft/[email protected]
         with:

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -75,9 +75,9 @@ stages:
           - powershell: New-Item -Type Directory -Force "$env:VCPKG_DEFAULT_BINARY_CACHE"
           - task: Cache@2
             inputs:
-              key: '"2338-bin-mac-host"'
+              key: '"v2338-bin-mac-host"'
               restoreKeys: |
-                "2338-bin-mac-host"
+                "v2338-bin-mac-host"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             displayName: "coreml-tools"
@@ -124,15 +124,15 @@ stages:
               vcpkgGitCommitId: $(vcpkg.commit)
           - task: Cache@2
             inputs:
-              key: '"2338-down-windows"'
+              key: '"v2338-down-windows"'
               restoreKeys: |
-                "2338-down-windows"
+                "v2338-down-windows"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"2338-bin-windows" | "$(vcpkg.default.triplet)"'
+              key: '"v2338-bin-windows" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "2338-bin-windows" | "$(vcpkg.default.triplet)"
+                "v2338-bin-windows" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -186,15 +186,15 @@ stages:
               vcpkgGitCommitId: $(vcpkg.commit)
           - task: Cache@2
             inputs:
-              key: '"2338-down-uwp"'
+              key: '"v2338-down-uwp"'
               restoreKeys: |
-                "2338-down-uwp"
+                "v2338-down-uwp"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"2338-bin-uwp" | "$(vcpkg.default.triplet)"'
+              key: '"v2338-bin-uwp" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "2338-bin-uwp" | "$(vcpkg.default.triplet)"
+                "v2338-bin-uwp" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -253,15 +253,15 @@ stages:
               vcpkgGitCommitId: $(vcpkg.commit)
           - task: Cache@2
             inputs:
-              key: '"2338-down-ubuntu"'
+              key: '"v2338-down-ubuntu"'
               restoreKeys: |
-                "2338-down-ubuntu"
+                "v2338-down-ubuntu"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"2338-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
+              key: '"v2338-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"'
               restoreKeys: |
-                "2338-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
+                "v2338-bin-ubuntu" | "$(vcpkg.default.triplet)_$(cc)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             displayName: "tensorflow-lite"
@@ -311,15 +311,15 @@ stages:
               vcpkgGitCommitId: $(vcpkg.commit)
           - task: Cache@2
             inputs:
-              key: '"2338-down-android"'
+              key: '"v2338-down-android"'
               restoreKeys: |
-                "2338-down-android"
+                "v2338-down-android"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"2338-bin-android" | "$(vcpkg.default.triplet)"'
+              key: '"v2338-bin-android" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "2338-bin-android" | "$(vcpkg.default.triplet)"
+                "v2338-bin-android" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -373,15 +373,15 @@ stages:
               vcpkgGitCommitId: $(vcpkg.commit)
           - task: Cache@2
             inputs:
-              key: '"2338-down-apple"'
+              key: '"v2338-down-apple"'
               restoreKeys: |
-                "2338-down-apple"
+                "v2338-down-apple"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"2338-bin-osx" | "$(vcpkg.default.triplet)"'
+              key: '"v2338-bin-osx" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "2338-bin-osx" | "$(vcpkg.default.triplet)"
+                "v2338-bin-osx" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             inputs:
@@ -433,15 +433,15 @@ stages:
               vcpkgGitCommitId: $(vcpkg.commit)
           - task: Cache@2
             inputs:
-              key: '"2338-down-apple"'
+              key: '"v2338-down-apple"'
               restoreKeys: |
-                "2338-down-apple"
+                "v2338-down-apple"
               path: $(Build.BinariesDirectory)/vcpkg/downloads
           - task: Cache@2
             inputs:
-              key: '"2338-bin-ios" | "$(vcpkg.default.triplet)"'
+              key: '"v2338-bin-ios" | "$(vcpkg.default.triplet)"'
               restoreKeys: |
-                "2338-bin-ios" | "$(vcpkg.default.triplet)"
+                "v2338-bin-ios" | "$(vcpkg.default.triplet)"
               path: $(vcpkg.default.binary.cache)
           - task: run-vcpkg@0
             displayName: "arm64-ios"