From 133f0117f7a9d4d38983b18bc2bdaca0054b9024 Mon Sep 17 00:00:00 2001
From: BtbN <btbn@btbn.de>
Date: Thu, 15 Apr 2021 22:39:40 +0200
Subject: [PATCH] Revert "Attempt to fix suboptimal cache behaviour"

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

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d18ff6f..e678eb1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -75,10 +75,6 @@ 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
@@ -90,11 +86,12 @@ jobs:
       - name: Image Name
         id: imagename
         run: |
-          IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}"
-          echo "::set-output name=name::${IMG/ /-}:latest"
-          echo "::set-output name=cache_name::${IMG/ /-}:cache"
+          IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
+          echo "::set-output name=name::${IMG/ /-}"
       - name: Build variant image
-        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 }} .
+        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 }}
   build_ffmpeg:
     name: Build ffmpeg
     needs: build_targets