Move image artifact cleanup to end of each workflow to avoid race condition

Author: malessi

.github/workflows/build-container-images.yml

@@ -321,7 +321,7 @@ jobs:
       - name: Upload image as artifact
         uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.image.name }}
+          name: build-images.${{ matrix.image.name }}
           path: ${{ runner.temp }}/${{ matrix.image.name }}.tar
           retention-days: 1
 
@@ -341,25 +341,13 @@ jobs:
           echo "::add-mask::$role_arn"
           echo "role-arn=$role_arn" >> "$GITHUB_OUTPUT"
 
-      - name: Delete base-images artifact
-        uses: GeekyEggo/delete-artifact@v5.1.0
-        with:
-          name: base-images
-          failOnError: false
-
       - name: Download all built image artifacts
         uses: actions/download-artifact@v4
         with:
+          pattern: build-images.*
           path: ${{ runner.temp }}
           merge-multiple: true
 
-      - name: Delete all image artifacts
-        if: ${{ inputs.cleanupImageArtifacts }}
-        uses: GeekyEggo/delete-artifact@v5.1.0
-        with:
-          name: '*'
-          failOnError: false
-
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -398,3 +386,13 @@ jobs:
           done
         working-directory: ${{ runner.temp }}
 
+  cleanup-artifacts:
+    if: ${{ !cancelled() && !inputs.cleanupImageArtifacts }}
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Delete all image artifacts
+        uses: GeekyEggo/delete-artifact@v5.1.0
+        with:
+          name: '*'
+          failOnError: false
+

.github/workflows/build-release.yml

@@ -147,12 +147,6 @@ jobs:
           name: bfd-platform-base-java
           path: ${{ runner.temp }}
 
-      - name: Delete unnecessary image Artifacts
-        uses: GeekyEggo/delete-artifact@v5.1.0
-        with:
-          name: '*'
-          failOnError: false
-
       - name: Load base image into Docker
         run: |
           docker load --input "${{ runner.temp }}/bfd-platform-base-java.tar"
@@ -267,12 +261,6 @@ jobs:
           name: jib-images
           path: ${{ runner.temp }}
 
-      - name: Delete jib image artifacts
-        uses: GeekyEggo/delete-artifact@v5.1.0
-        with:
-          name: jib-images
-          failOnError: false
-
       - name: Configure AWS credentials
         uses: aws-actions/configure-aws-credentials@v4
         with:
@@ -399,3 +387,14 @@ jobs:
           tag: ${{ needs.compute-version-strings.outputs.bfd_release }}
           name: "v${{ needs.compute-version-strings.outputs.bfd_release }}"
           artifacts: "*.csv,*.json,*.xlsx,*.yaml"
+
+  cleanup-artifacts:
+    if: ${{ !cancelled() }}
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Delete all image artifacts
+        uses: GeekyEggo/delete-artifact@v5.1.0
+        with:
+          name: '*'
+          failOnError: false
+