Cache more often.

V-Sekai · Oct 25, 2024 · 11e974e · 11e974e
1 parent 9072f70
commit 11e974e
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -37,20 +37,22 @@ jobs:
 
       - name: Cache SCons cache
         uses: actions/cache@v4
+        if: always()
         with:
-          path:  |
-              .scons_cache
-              emsdk
-              osxcross
-              jdk
-              android_sdk
-              vulkan_sdk
-              mingw
-          key: ${{ runner.os }}-scons-${{ matrix.platform }}-${{ matrix.target }}
+          path: |
+            .scons_cache
+            emsdk
+            osxcross
+            jdk
+            android_sdk
+            vulkan_sdk
+            mingw
+          key: ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }}-${{ matrix.platform }}-${{ matrix.target }}
           restore-keys: |
-            ${{ runner.os }}-scons-${{ matrix.platform }}-${{ matrix.target }}
-            ${{ runner.os }}-scons-
-            ${{ runner.os }}
+            ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }}-${{ matrix.platform }}-${{ matrix.target }}
+            ${{ github.event_name == 'pull_request' && github.head_ref || github.ref_name }}-${{ matrix.platform }}
+            ${{ matrix.platform }}-${{ matrix.target }}
+            ${{ matrix.platform }}
 
       - uses: bencherdev/bencher@main