From c9815e2ccb3fab890ea74266834e25032b6f6c40 Mon Sep 17 00:00:00 2001 From: Geoff Bourne Date: Fri, 21 May 2021 17:04:11 -0500 Subject: [PATCH] ci: use CACHE_NAME in main.yml --- .github/workflows/build-multiarch.yml | 1 + .github/workflows/main.yml | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml index 128f4199..56248782 100644 --- a/.github/workflows/build-multiarch.yml +++ b/.github/workflows/build-multiarch.yml @@ -49,6 +49,7 @@ jobs: key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} restore-keys: | ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}- + ${{ runner.os }}-buildx- - name: Set up QEMU uses: docker/setup-qemu-action@v1.1.0 diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index d402dcdc..00bc22bb 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -29,6 +29,8 @@ jobs: needs: - test runs-on: ubuntu-20.04 + env: + CACHE_NAME: master steps: - uses: actions/checkout@v2.3.4 @@ -60,9 +62,9 @@ jobs: uses: actions/cache@v2.1.5 with: path: /tmp/.buildx-cache - key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }} + key: ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}- + ${{ runner.os }}-buildx-${{ env.CACHE_NAME }}- ${{ runner.os }}-buildx- - name: Login to DockerHub