Only remove old cache directory we know we are done with.

GrahamDumpleton · Oct 12, 2023 · 4e8d3eb · 4e8d3eb
1 parent db9d788
commit 4e8d3eb
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/.github/workflows/build-and-publish-images.yaml b/.github/workflows/build-and-publish-images.yaml
@@ -264,27 +264,27 @@ jobs:
             type=local,src=/tmp/.buildx-cache-amd64-old
           push: true
 
-      - name: Remove old cache directories
-        run: |
-          rm -rf /tmp/.buildx-cache-*-old
-
       - name: Cache build ${{matrix.image}} (amd64)
         if: contains(env.TARGET_PLATFORMS, 'linux/amd64')
         uses: docker/build-push-action@v5
         with:
           context: workshop-images/base-environment
           platforms: linux/amd64
-          # cache-from: type=local,src=/tmp/.buildx-cache-amd64-old
+          cache-from: type=local,src=/tmp/.buildx-cache-amd64-old
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-amd64-new,compression=zstd
           push: false
 
+      - name: Remove old cache directories
+        run: |
+          rm -rf /tmp/.buildx-cache-amd64-old
+
       - name: Cache build ${{matrix.image}} (arm64)
         if: contains(env.TARGET_PLATFORMS, 'linux/arm64')
         uses: docker/build-push-action@v5
         with:
           context: workshop-images/base-environment
           platforms: linux/arm64
-          # cache-from: type=local,src=/tmp/.buildx-cache-arm64-old
+          cache-from: type=local,src=/tmp/.buildx-cache-arm64-old
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-arm64-new,compression=zstd
           push: false
 
@@ -418,10 +418,6 @@ jobs:
             type=local,src=/tmp/.buildx-cache-amd64-old
           push: true
 
-      - name: Remove old cache directories
-        run: |
-          rm -rf /tmp/.buildx-cache-*-old
-
       - name: Cache build ${{matrix.image}} (amd64)
         if: contains(env.TARGET_PLATFORMS, 'linux/amd64')
         uses: docker/build-push-action@v5
@@ -432,10 +428,14 @@ jobs:
             IMAGE_REPOSITORY=ghcr.io/${{env.REPOSITORY_OWNER}}
             BASE_IMAGE_NAME=educates-base-environment
             PACKAGE_VERSION=${{env.REPOSITORY_SHA_TAG}}
-          # cache-from: type=local,src=/tmp/.buildx-cache-amd64-old
+          cache-from: type=local,src=/tmp/.buildx-cache-amd64-old
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-amd64-new,compression=zstd
           push: false
 
+      - name: Remove old cache directories
+        run: |
+          rm -rf /tmp/.buildx-cache-amd64-old
+
       - name: Cache build ${{matrix.image}} (arm64)
         if: contains(env.TARGET_PLATFORMS, 'linux/arm64')
         uses: docker/build-push-action@v5
@@ -446,7 +446,7 @@ jobs:
             IMAGE_REPOSITORY=ghcr.io/${{env.REPOSITORY_OWNER}}
             BASE_IMAGE_NAME=educates-base-environment
             PACKAGE_VERSION=${{env.REPOSITORY_SHA_TAG}}
-          # cache-from: type=local,src=/tmp/.buildx-cache-arm64-old
+          cache-from: type=local,src=/tmp/.buildx-cache-arm64-old
           cache-to: type=local,mode=max,dest=/tmp/.buildx-cache-arm64-new,compression=zstd
           push: false