Handle the fact the github actions cache does not allows updates

If there is a cache hit, there is never a save. Therefore, we need to always miss on the first run attempt, falling back hopefully to the previous run.
rabbitmq · Apr 24, 2024 · 9e90669 · 9e90669
1 parent f129eac
commit 9e90669
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 12 deletions.
diff --git a/.github/workflows/test-make.template.yaml b/.github/workflows/test-make.template.yaml
@@ -216,9 +216,10 @@ jobs:
         uses: actions/[email protected]
         with:
           path: /home/runner/test-result-cache/
-          key: ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}
+          key: ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}-${{ github.run_number }}-${{ github.run_attempt - 1 }}
           restore-keys: |
-            ${{ runner.os }}-test-result-cache-
+            ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}-${{ github.run_number }}-
+            ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}-
       - name: PREP CACHE DIR
         run: |
           mkdir -p /home/runner/test-result-cache/${{ steps.hash.outputs.hash }}
@@ -250,10 +251,7 @@ jobs:
         uses: actions/[email protected]
         with:
           path: /home/runner/test-result-cache/
-          key: ${{ runner.os }}-test-result-cache-${{ needs.load-test-result-cache.outputs.hash }}
-          restore-keys: |
-            ${{ runner.os }}-test-result-cache-
-          fail-on-cache-miss: true
+          key: ${{ runner.os }}-test-result-cache-${{ needs.load-test-result-cache.outputs.hash }}-${{ github.run_number }}-${{ github.run_attempt }}
           save-always: true
       - name: UPDATE CACHE
         uses: actions/download-artifact@v4

diff --git a/.github/workflows/test-make.yaml b/.github/workflows/test-make.yaml
@@ -39,9 +39,10 @@ jobs:
       uses: actions/[email protected]
       with:
         path: /home/runner/test-result-cache/
-        key: ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}
+        key: ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}-${{ github.run_number }}-${{ github.run_attempt - 1 }}
         restore-keys: |
-          ${{ runner.os }}-test-result-cache-
+          ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}-${{ github.run_number }}-
+          ${{ runner.os }}-test-result-cache-${{ steps.hash.outputs.hash }}-
     - name: PREP CACHE DIR
       run: |
         mkdir -p /home/runner/test-result-cache/${{ steps.hash.outputs.hash }}
@@ -6937,10 +6938,7 @@ jobs:
       uses: actions/[email protected]
       with:
         path: /home/runner/test-result-cache/
-        key: ${{ runner.os }}-test-result-cache-${{ needs.load-test-result-cache.outputs.hash }}
-        restore-keys: |
-          ${{ runner.os }}-test-result-cache-
-        fail-on-cache-miss: true
+        key: ${{ runner.os }}-test-result-cache-${{ needs.load-test-result-cache.outputs.hash }}-${{ github.run_number }}-${{ github.run_attempt }}
         save-always: true
     - name: UPDATE CACHE
       uses: actions/download-artifact@v4