Prevent any caching between repo versions

game-ci · Oct 19, 2020 · eb5eb3c · eb5eb3c
1 parent de6a820
commit eb5eb3c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/new-base-image-requested.yml b/.github/workflows/new-base-image-requested.yml
@@ -63,10 +63,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-base-${{ github.sha }}
+          key: ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-base-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-base
-            ${{ runner.os }}-buildx-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-base
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-
       ###########################
       #        Base image       #
       ###########################

diff --git a/.github/workflows/new-editor-image-requested.yml b/.github/workflows/new-editor-image-requested.yml
@@ -77,12 +77,12 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ matrix.targetPlatform }}-${{ github.sha }}
+          key: ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ matrix.targetPlatform }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ matrix.targetPlatform }}-
-            ${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-
-            ${{ runner.os }}-buildx-editor-
-            ${{ runner.os }}-buildx-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ matrix.targetPlatform }}-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-
       ###########################
       #    Free disk space   #
       ###########################

diff --git a/.github/workflows/new-hub-image-requested.yml b/.github/workflows/new-hub-image-requested.yml
@@ -63,10 +63,10 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-hub-${{ github.sha }}
+          key: ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-hub-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-hub
-            ${{ runner.os }}-buildx-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-hub
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-
       ###########################
       #   Pull previous images  #
       ###########################

diff --git a/.github/workflows/retry-editor-image-requested.yml b/.github/workflows/retry-editor-image-requested.yml
@@ -68,12 +68,12 @@ jobs:
         uses: actions/cache@v2
         with:
           path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ github.event.client_payload.targetPlatform }}-${{ github.sha }}
+          key: ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ github.event.client_payload.targetPlatform }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ github.event.client_payload.targetPlatform }}-
-            ${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-
-            ${{ runner.os }}-buildx-editor-
-            ${{ runner.os }}-buildx-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-${{ github.event.client_payload.targetPlatform }}-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-${{ github.event.client_payload.editorVersion }}-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-editor-
+            ${{ github.event.client_payload.repoVersionFull }}-${{ runner.os }}-buildx-
       ###########################
       #    Free disk space   #
       ###########################