ci: pass the whole key instead of trying to reconstruct it

dashpay · Feb 10, 2025 · 1a67a02 · 1a67a02
1 parent 374e980
commit 1a67a02
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 13 deletions.
diff --git a/.github/workflows/build-depends.yml b/.github/workflows/build-depends.yml
@@ -15,6 +15,10 @@ on:
         description: "Target triplet"
         required: true
         type: string
+    outputs:
+      key:
+        description: "Key needed for restoring depends cache"
+        value: ${{ jobs.build-depends.restore.outputs.cache-primary-key }}
 
 jobs:
   build-depends:
@@ -39,8 +43,9 @@ jobs:
             depends-sources-${{ hashFiles('depends/packages/*') }}
             depends-sources-
 
-      - name: Cache depends
-        uses: actions/cache@v4
+      - name: Restore cached depends
+        uses: actions/cache/restore@v4
+        id: restore
         with:
           path: |
             depends/built
@@ -52,3 +57,12 @@ jobs:
 
       - name: Build depends
         run: env HOST=${{ inputs.host }} make -j$(nproc) -C depends
+
+      - name: Save depends cache
+        uses: actions/cache/save@v4
+        if: steps.restore.outputs.cache-hit != 'true'
+        with:
+          path: |
+            depends/built
+            depends/${{ inputs.host }}
+          key: ${{ steps.restore.outputs.cache-primary-key }}
diff --git a/.github/workflows/build-src.yml b/.github/workflows/build-src.yml
@@ -11,8 +11,8 @@ on:
         description: "Path to built container at registry"
         required: true
         type: string
-      depends-target:
-        description: "Target name of depends as defined by inputs.sh"
+      depends-key:
+        description: "Key needed to access cached depends"
         required: true
         type: string
       host:
@@ -40,7 +40,8 @@ jobs:
           path: |
             depends/built
             depends/${{ inputs.host }}
-          key: ${{ runner.os }}-depends-${{ inputs.depends-target }}-${{ hashFiles('depends/packages/*') }}
+          key: ${{ inputs.depends-key }}
+          fail-on-cache-miss: true
 
       - name: Determine PR Base SHA
         id: vars

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -42,7 +42,7 @@ jobs:
     with:
       build-target: arm-linux
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: arm-linux
+      depends-key: ${{ needs.depends-arm-linux.outputs.key }}
       host: arm-linux-gnueabihf
 
   src-linux64:
@@ -52,7 +52,7 @@ jobs:
     with:
       build-target: linux64
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: linux64
+      depends-key: ${{ needs.depends-linux64.outputs.key }}
       host: x86_64-pc-linux-gnu
 
   src-linux64_cxx20:
@@ -62,7 +62,7 @@ jobs:
     with:
       build-target: linux64_cxx20
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: linux64
+      depends-key: ${{ needs.depends-linux64.outputs.key }}
       host: x86_64-pc-linux-gnu
 
   src-linux64_fuzz:
@@ -72,7 +72,7 @@ jobs:
     with:
       build-target: linux64_fuzz
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: linux64
+      depends-key: ${{ needs.depends-linux64.outputs.key }}
       host: x86_64-pc-linux-gnu
 
   src-linux64_nowallet:
@@ -82,7 +82,7 @@ jobs:
     with:
       build-target: linux64_nowallet
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: linux64
+      depends-key: ${{ needs.depends-linux64.outputs.key }}
       host: x86_64-pc-linux-gnu
 
   src-linux64_sqlite:
@@ -92,7 +92,7 @@ jobs:
     with:
       build-target: linux64_sqlite
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: linux64
+      depends-key: ${{ needs.depends-linux64.outputs.key }}
       host: x86_64-pc-linux-gnu
 
   src-linux64_tsan:
@@ -102,7 +102,7 @@ jobs:
     with:
       build-target: linux64_tsan
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: linux64
+      depends-key: ${{ needs.depends-linux64.outputs.key }}
       host: x86_64-pc-linux-gnu
 
   src-linux64_ubsan:
@@ -112,5 +112,5 @@ jobs:
     with:
       build-target: linux64_ubsan
       container-path: ${{ needs.container.outputs.path }}
-      depends-target: linux64
+      depends-key: ${{ needs.depends-linux64.outputs.key }}
       host: x86_64-pc-linux-gnu