From cb2b0b0d6541b6ae1e63e6dfd1b243866e0d9594 Mon Sep 17 00:00:00 2001 From: Leonard Jonathan Oh Date: Fri, 27 Jan 2023 09:01:37 +0000 Subject: [PATCH] Fix (ci): Use proper restore-keys to restore docker cache --- .github/workflows/ci-master-pr.yml | 52 +++++++++---------- .../.github/workflows/ci-master-pr.yml.ps1 | 2 +- 2 files changed, 27 insertions(+), 27 deletions(-) diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 524a241..e89416a 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -47,7 +47,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -184,7 +184,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -320,7 +320,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -456,7 +456,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -592,7 +592,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -728,7 +728,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -864,7 +864,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1000,7 +1000,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1136,7 +1136,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1272,7 +1272,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1408,7 +1408,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1544,7 +1544,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1680,7 +1680,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1816,7 +1816,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -1952,7 +1952,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -2088,7 +2088,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -2224,7 +2224,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -2360,7 +2360,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -2496,7 +2496,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -2632,7 +2632,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -2768,7 +2768,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -2904,7 +2904,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -3040,7 +3040,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -3176,7 +3176,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -3312,7 +3312,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare @@ -3448,7 +3448,7 @@ jobs: path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare diff --git a/generate/templates/.github/workflows/ci-master-pr.yml.ps1 b/generate/templates/.github/workflows/ci-master-pr.yml.ps1 index 0f2fb62..6d6cf19 100644 --- a/generate/templates/.github/workflows/ci-master-pr.yml.ps1 +++ b/generate/templates/.github/workflows/ci-master-pr.yml.ps1 @@ -57,7 +57,7 @@ $VARIANTS | % { path: /tmp/.buildx-cache key: ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }} + ${{ runner.os }}-buildx-${{ env.VARIANT_TAG }}- ${{ runner.os }}-buildx- - name: Prepare