From a3cf605fa91546592fc301f45d9743cb23d29cf0 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 15 Apr 2021 20:13:40 +0200
Subject: [PATCH] Attempt to fix suboptimal cache behaviour

---
 .github/workflows/build.yml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e678eb1..d18ff6f 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,6 +75,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v2
+      - name: Install buildx
+        uses: docker/setup-buildx-action@v1
+        with:
+          install: true
       - name: Generate Dockerfile
         run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }}
       - name: Login to Docker
@@ -86,12 +90,11 @@ jobs:
       - name: Image Name
         id: imagename
         run: |
-          IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
-          echo "::set-output name=name::${IMG/ /-}"
+          IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
+          echo "::set-output name=name::${IMG/ /-}:latest"
+          echo "::set-output name=cache_name::${IMG/ /-}:cache"
       - name: Build variant image
-        run: docker build --pull --build-arg BUILDKIT_INLINE_CACHE=1 --cache-from ${{ steps.imagename.outputs.name }} --tag ${{ steps.imagename.outputs.name }} .
-      - name: Push variant image
-        run: docker push ${{ steps.imagename.outputs.name }}
+        run: docker build --pull --cache-to=type=registry,mode=max,ref=${{ steps.imagename.outputs.cache_name }} --cache-from=type=registry,ref=${{ steps.imagename.outputs.cache_name }} --output=type=registry --tag ${{ steps.imagename.outputs.name }} .
   build_ffmpeg:
     name: Build ffmpeg
     needs: build_targets