From 9469291731bacf1655f8eca52405889bb9a58b8e Mon Sep 17 00:00:00 2001
From: Geoff Bourne <itzgeoff@gmail.com>
Date: Sat, 9 Jan 2021 12:28:27 -0600
Subject: [PATCH] ci: Switched multiarch build caching to github actions

---
 .github/workflows/build-multiarch.yml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build-multiarch.yml b/.github/workflows/build-multiarch.yml
index 28387d26..1a1baf3a 100644
--- a/.github/workflows/build-multiarch.yml
+++ b/.github/workflows/build-multiarch.yml
@@ -4,14 +4,14 @@ on:
     branches:
       - multiarch
       - multiarch-latest
-      - "test-multiarch-.*"
+      - "test/multiarch-*"
     tags:
       - "[0-9]+.[0-9]+.[0-9]+-multiarch"
       - "[0-9]+.[0-9]+.[0-9]+-multiarch-latest"
 
 jobs:
   docker-buildx:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     steps:
       - name: Checkout
         uses: actions/checkout@v2.2.0
@@ -30,13 +30,22 @@ jobs:
               VERSION=latest
             fi
           fi
-          TAGS="${DOCKER_IMAGE}:${VERSION}"
+          TAGS="${DOCKER_IMAGE}:${VERSION//\//-}"
           echo ::set-output name=tags::${TAGS}
           echo ::set-output name=cache_from::${TAGS}
+          echo ::set-output name=cache_version::${VERSION//\//-}
 
       - name: Setup Docker Buildx
         uses: docker/setup-buildx-action@v1
 
+      - name: Cache Docker layers
+        uses: actions/cache@v2
+        with:
+          path: /tmp/.buildx-cache
+          key: ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-${{ github.sha }}
+          restore-keys: |
+            ${{ runner.os }}-buildx-${{ steps.prep.outputs.cache_version }}-
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v1
 
@@ -55,8 +64,8 @@ jobs:
           platforms: linux/amd64,linux/arm/v7,linux/arm64
           push: ${{ github.event_name != 'pull_request' }}
           tags: ${{ steps.prep.outputs.tags }}
-          cache-from: type=registry,ref=${{ steps.prep.outputs.cache_from }}
-          cache-to: type=inline
+          cache-from: type=local,src=/tmp/.buildx-cache
+          cache-to: type=local,dest=/tmp/.buildx-cache
 
       - name: Image digest
         run: echo ${{ steps.docker_build.outputs.digest }}