Improve the cache keys to prevent clashes for the wrong type of build

thebestnom · Jul 23, 2020 · afdce1e · afdce1e
1 parent 3c07d0f
commit afdce1e
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 30 deletions.
diff --git a/.github/workflows/android_builds.yml b/.github/workflows/android_builds.yml
@@ -43,11 +43,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{runner.os}}-template-${{github.sha}}
+          key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
           restore-keys: |
-            ${{runner.os}}-template-${{github.sha}}
-            ${{runner.os}}-template
-            ${{runner.os}}
+            ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+            ${{github.job}}-${GITHUB_REF##*/}
+            ${{github.job}}
 
         # Use python 3.x release (works cross platform)
       - name: Set up Python 3.x

diff --git a/.github/workflows/javascript_builds.yml b/.github/workflows/javascript_builds.yml
@@ -29,9 +29,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{github.job}}-${{github.sha}}
+          key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
           restore-keys: |
-            ${{github.job}}-${{github.sha}}
+            ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+            ${{github.job}}-${GITHUB_REF##*/}
             ${{github.job}}
 
       # Additional cache for Emscripten generated system libraries

diff --git a/.github/workflows/linux_builds.yml b/.github/workflows/linux_builds.yml
@@ -33,11 +33,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{runner.os}}-editor-${{github.sha}}
+          key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
           restore-keys: |
-            ${{runner.os}}-editor-${{github.sha}}
-            ${{runner.os}}-editor
-            ${{runner.os}}
+            ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+            ${{github.job}}-${GITHUB_REF##*/}
+            ${{github.job}}
 
       # Use python 3.x release (works cross platform; best to keep self contained in it's own step)
       - name: Set up Python 3.x
@@ -90,11 +90,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{runner.os}}-template-${{github.sha}}
+          key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
           restore-keys: |
-            ${{runner.os}}-template-${{github.sha}}
-            ${{runner.os}}-template
-            ${{runner.os}}
+            ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+            ${{github.job}}-${GITHUB_REF##*/}
+            ${{github.job}}
 
       # Use python 3.x release (works cross platform)
       - name: Set up Python 3.x

diff --git a/.github/workflows/macos_builds.yml b/.github/workflows/macos_builds.yml
@@ -22,11 +22,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{runner.os}}-editor-${{github.sha}}
+          key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
           restore-keys: |
-            ${{runner.os}}-editor-${{github.sha}}
-            ${{runner.os}}-editor
-            ${{runner.os}}
+            ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+            ${{github.job}}-${GITHUB_REF##*/}
+            ${{github.job}}
 
       # Use python 3.x release (works cross platform; best to keep self contained in it's own step)
       - name: Set up Python 3.x
@@ -67,11 +67,11 @@ jobs:
         uses: actions/cache@v2
         with:
           path: ${{github.workspace}}/.scons_cache/
-          key: ${{runner.os}}-template-${{github.sha}}
+          key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
           restore-keys: |
-            ${{runner.os}}-template-${{github.sha}}
-            ${{runner.os}}-template
-            ${{runner.os}}
+            ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+            ${{github.job}}-${GITHUB_REF##*/}
+            ${{github.job}}
 
       # Use python 3.x release (works cross platform)
       - name: Set up Python 3.x

diff --git a/.github/workflows/windows_builds.yml b/.github/workflows/windows_builds.yml
@@ -26,11 +26,11 @@ jobs:
       uses: RevoluPowered/[email protected]
       with:
         path: /.scons_cache/
-        key: ${{runner.os}}-editor-${{github.sha}}
+        key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
         restore-keys: |
-          ${{runner.os}}-editor-${{github.sha}}
-          ${{runner.os}}-editor
-          ${{runner.os}}
+          ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+          ${{github.job}}-${GITHUB_REF##*/}
+          ${{github.job}}
 
     # Use python 3.x release (works cross platform; best to keep self contained in it's own step)
     - name: Set up Python 3.x
@@ -80,11 +80,11 @@ jobs:
       uses: RevoluPowered/[email protected]
       with:
         path: /.scons_cache/
-        key: ${{runner.os}}-template-${{github.sha}}
+        key: ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
         restore-keys: |
-          ${{runner.os}}-template-${{github.sha}}
-          ${{runner.os}}-template
-          ${{runner.os}}
+          ${{github.job}}-${GITHUB_REF##*/}-${{github.sha}}
+          ${{github.job}}-${GITHUB_REF##*/}
+          ${{github.job}}
 
     # Use python 3.x release (works cross platform)
     - name: Set up Python 3.x