From b2fe209a6a7afb8306d68239e7a1a91ac1254daf Mon Sep 17 00:00:00 2001
From: 34FathomBelow <34fathombelow@protonmail.com>
Date: Wed, 1 Jun 2022 18:20:11 -0700
Subject: [PATCH] ci: remove cache from image build (#9564)

Signed-off-by: Justin Marquis <34fathombelow@protonmail.com>
---
 .github/workflows/image.yaml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index db9dd36234979..b111458f15304 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -50,24 +50,6 @@ jobs:
       - uses: docker/setup-qemu-action@v1
       - uses: docker/setup-buildx-action@v1
 
-      - name: Setup cache for argocd-ui docker layer
-        uses: actions/cache@v2
-        with:
-          path: /tmp/.buildx-cache
-          key: ${{ runner.os }}-single-buildx-${{ github.sha }}
-          restore-keys: |
-            ${{ runner.os }}-single-buildx
-
-      - name: Build cache for argocd-ui stage
-        uses: docker/build-push-action@v2
-        with:
-          context: ./src/github.com/argoproj/argo-cd
-          target: argocd-ui
-          push: false
-          cache-from: type=local,src=/tmp/.buildx-cache
-          cache-to: type=local,dest=/tmp/.buildx-cache-new,mode=max
-        if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'test-arm-image')
-
       - name: Run non-container Snyk scans
         if: github.event_name == 'push'
         working-directory: ./src/github.com/argoproj/argo-cd
@@ -88,7 +70,6 @@ jobs:
           fi
           echo "Building image for platforms: $IMAGE_PLATFORMS"
           docker buildx build --platform $IMAGE_PLATFORMS --push="${{ github.event_name == 'push' }}" \
-            --cache-from "type=local,src=/tmp/.buildx-cache" \
             -t ghcr.io/argoproj/argocd:${{ steps.image.outputs.tag }} \
             -t quay.io/argoproj/argocd:latest .
         working-directory: ./src/github.com/argoproj/argo-cd
@@ -101,15 +82,6 @@ jobs:
         run: |
           snyk container test quay.io/argoproj/argocd:latest --org=argoproj --file=Dockerfile --severity-threshold=high
 
-        # Temp fix
-        # https://github.com/docker/build-push-action/issues/252
-        # https://github.com/moby/buildkit/issues/1896
-      - name: Clean up build cache
-        run: |
-          rm -rf /tmp/.buildx-cache
-          mv /tmp/.buildx-cache-new /tmp/.buildx-cache
-        if: github.event_name == 'push' || contains(github.event.pull_request.labels.*.name, 'test-arm-image')
-
       # deploy
       - run: git clone "https://$TOKEN@github.com/argoproj/argoproj-deployments"
         if: github.event_name == 'push'