Revert "Attempt to fix suboptimal cache behaviour"

This reverts commit a3cf605fa9.
This commit is contained in:
BtbN 2021-04-15 22:39:40 +02:00
parent 08b987be81
commit 133f0117f7

View file

@ -75,10 +75,6 @@ jobs:
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v2
- name: Install buildx
uses: docker/setup-buildx-action@v1
with:
install: true
- name: Generate Dockerfile - name: Generate Dockerfile
run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }} run: ./generate.sh ${{ matrix.target }} ${{ matrix.variant }}
- name: Login to Docker - name: Login to Docker
@ -90,11 +86,12 @@ jobs:
- name: Image Name - name: Image Name
id: imagename id: imagename
run: | run: |
IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}" IMG="ghcr.io/${GITHUB_REPOSITORY,,}/${{ matrix.target }}-${{ matrix.variant }}:latest"
echo "::set-output name=name::${IMG/ /-}:latest" echo "::set-output name=name::${IMG/ /-}"
echo "::set-output name=cache_name::${IMG/ /-}:cache"
- name: Build variant image - 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: build_ffmpeg:
name: Build ffmpeg name: Build ffmpeg
needs: build_targets needs: build_targets