Workaround actions/cache@v4 save-always not working as expected

Author: HoloRin

.github/workflows/templates/test-make.template.yaml

@@ -131,15 +131,14 @@
           key: ${{ runner.os }}-make-cache-${{ needs.xref.outputs.hash }}
           fail-on-cache-miss: true
       - name: RESTORE TEST RESULT CACHE
-        uses: actions/cache@v4
+        uses: actions/cache/restore@v4
         with:
           path: /home/runner/test-result-cache/
           key: ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-${{ github.run_attempt }}
           restore-keys: |
             ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-${{ needs.xref.outputs.previous_run_attempt }}
             ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-
             ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-
-          save-always: true
       - name: PRINT CACHED RESULTS
         run: |
           set -x
@@ -164,6 +163,11 @@
                 RABBITMQ_METADATA_STORE=${{ matrix.metadata_store }}
             touch ${{ env.SUCCESS_PATH }}/checks
           fi
+      - name: SAVE TEST RESULT CACHE
+        uses: actions/cache/save@v4
+        with:
+          path: /home/runner/test-result-cache/
+          key: ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-${{ github.run_attempt }}
       - name: UPLOAD TEST ARTIFACTS
         if: always()
         uses: actions/[email protected]

.github/workflows/test-make.yaml

@@ -2400,15 +2400,14 @@ jobs:
         key: ${{ runner.os }}-make-cache-${{ needs.xref.outputs.hash }}
         fail-on-cache-miss: true
     - name: RESTORE TEST RESULT CACHE
-      uses: actions/cache@v4
+      uses: actions/cache/restore@v4
       with:
         path: /home/runner/test-result-cache/
         key: ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-${{ github.run_attempt }}
         restore-keys: |
           ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-${{ needs.xref.outputs.previous_run_attempt }}
           ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-
           ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-
-        save-always: true
     - name: PRINT CACHED RESULTS
       run: |
         set -x
@@ -2433,6 +2432,11 @@ jobs:
               RABBITMQ_METADATA_STORE=${{ matrix.metadata_store }}
           touch ${{ env.SUCCESS_PATH }}/checks
         fi
+    - name: SAVE TEST RESULT CACHE
+      uses: actions/cache/save@v4
+      with:
+        path: /home/runner/test-result-cache/
+        key: ${{ runner.os }}-test-result-cache-${{ needs.xref.outputs.hash }}-rabbitmq_cli-${{ github.run_number }}-${{ github.run_attempt }}
     - name: UPLOAD TEST ARTIFACTS
       if: always()
       uses: actions/[email protected]