ci: fix failing test on workflow_dispatch event

Signed-off-by: Emilien Escalle <[email protected]>

Author: neilime

.github/workflows/__test-action-docker-prune-pull-requests-image-tags.yml

@@ -14,35 +14,41 @@ permissions:
 
 env:
   IMAGE_NAME: "test-prune-${{ github.run_number }}"
-  PACKAGES: |
-    ci-github-container/test-prune-${{ github.run_number }}
-    ${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'push' && github.ref_name != github.event.repository.default_branch)
-        && ''
-        || format('ci-github-container/test-prune-{0}/cache', github.run_number)
-    }}
 
 jobs:
-  setup:
+  arrange-prepare-variables:
+    name: Arrange - Prepare variables
     runs-on: ubuntu-latest
     outputs:
-      tag: ${{ steps.generate-tag.outputs.tag }}
+      tag: ${{ steps.prepare-variables.outputs.tag }}
+      packages: ${{ steps.prepare-variables.outputs.packages }}
     steps:
-      - run: |
-          if [ -z "${{ secrets.GITHUB_TOKEN }}" ]; then
-            echo "GitHub token secrets is not set"
-            exit 1
-          fi
-
-      - id: generate-tag
-        name: Generate random PR tag
-        run: |
-          # Generate a random tag to be deleted that cannot collide with an open PR tag
-          TAG="pr-$(( 1 + RANDOM % 210))"
-          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
+      - id: prepare-variables
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        env:
+          SECRETS_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          script: |
+            if(!process.env.SECRETS_GITHUB_TOKEN) {
+              return core.setFailed("GitHub token secrets is not set");
+            }
 
-  arrange:
+            // Generate random PR tag
+            core.setOutput("tag", `pr-${1 + Math.floor(Math.random() * 210)}`);
+
+            // Define expected packages
+            const packages = [
+              `ci-github-container/${process.env.IMAGE_NAME}`,
+            ];
+
+            if (github.event_name === 'workflow_dispatch' || (github.event_name === 'push' && github.ref_name !== github.event.repository.default_branch)) {
+              packages.push(`ci-github-container/${process.env.IMAGE_NAME}/cache`);
+            }
+            core.setOutput("packages", packages.join("\n"));
+
+  arrange-build-images:
     name: Arrange - Build images
-    needs: setup
+    needs: arrange-prepare-variables
     uses: ./.github/workflows/docker-build-images.yml
     secrets:
       oci-registry-password: ${{ secrets.GITHUB_TOKEN }}
@@ -63,7 +69,7 @@ jobs:
   arrange-verify:
     name: Arrange - Verify built images
     runs-on: ubuntu-latest
-    needs: arrange
+    needs: [arrange-prepare-variables, arrange-build-images]
     permissions:
       contents: read
       packages: read
@@ -75,7 +81,8 @@ jobs:
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
-          BUILT_IMAGES: ${{ needs.arrange.outputs.built-images }}
+          BUILT_IMAGES: ${{ needs.arrange-build-images.outputs.built-images }}
+          PACKAGES: ${{ needs.arrange-prepare-variables.outputs.packages }}
         with:
           script: |
             const packages = process.env.PACKAGES.split("\n").map(packageName => packageName.trim()).filter(Boolean);
@@ -108,7 +115,7 @@ jobs:
   act:
     name: Act - Prune pull requests image tags
     runs-on: ubuntu-latest
-    needs: [setup, arrange, arrange-verify]
+    needs: [arrange-prepare-variables, arrange-build-images, arrange-verify]
     permissions:
       packages: write
     steps:
@@ -124,8 +131,8 @@ jobs:
         env:
           BASE_IMAGE: ${{ needs.arrange-verify.outputs.base-image }}
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
-          TAG_TO_DELETE: ${{ needs.setup.outputs.tag }}
-          BUILT_IMAGES: ${{ needs.arrange.outputs.built-images }}
+          TAG_TO_DELETE: ${{ needs.arrange-prepare-variables.outputs.tag }}
+          BUILT_IMAGES: ${{ needs.arrange-build-images.outputs.built-images }}
         run: |
           NEW_IMAGE="ghcr.io/hoverkraft-tech/ci-github-container/$IMAGE_NAME:$TAG_TO_DELETE"
 
@@ -141,12 +148,13 @@ jobs:
   assert:
     name: Assert - Verify deleted image tags
     runs-on: ubuntu-latest
-    needs: [setup, arrange, act]
+    needs: [arrange-prepare-variables, arrange-build-images, act]
     steps:
       - name: Assert - Ensure expected packages versions have been deleted
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
-          TAG_TO_DELETE: ${{ needs.setup.outputs.tag }}
+          TAG_TO_DELETE: ${{ needs.arrange-prepare-variables.outputs.tag }}
+          PACKAGES: ${{ needs.arrange-prepare-variables.outputs.packages }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |
@@ -189,7 +197,7 @@ jobs:
         env:
           IMAGE_NAME: ${{ env.IMAGE_NAME }}
         run: |
-          for IMAGE_TAG in $(echo '${{ needs.arrange.outputs.built-images }}' | jq -r '."${{ env.IMAGE_NAME }}".images[]'); do
+          for IMAGE_TAG in $(echo '${{ needs.arrange-build-images.outputs.built-images }}' | jq -r '."${{ env.IMAGE_NAME }}".images[]'); do
             docker pull "$IMAGE_TAG"
 
             if ! MANIFEST=$(docker manifest inspect "$IMAGE_TAG"); then
@@ -211,7 +219,7 @@ jobs:
           done
 
   cleanup:
-    needs: assert
+    needs: [arrange-prepare-variables, assert]
     runs-on: "ubuntu-latest"
     permissions:
       packages: write
@@ -221,6 +229,8 @@ jobs:
 
       - name: Delete test packages
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        env:
+          PACKAGES: ${{ needs.arrange-prepare-variables.outputs.packages }}
         with:
           github-token: ${{ secrets.GITHUB_TOKEN }}
           script: |