From 0178a48a83ee6452cc9164dc9ae0d1b13d1ee943 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 19 Jul 2023 00:53:15 -0400
Subject: [PATCH] GHA: wipe out temp build artifacts via self-hosted runner for
 distro build

---
 .github/workflows/gh-hosted-eclipse-distro-build.yml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index 426dae07d..ed7bc7610 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -106,6 +106,8 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
         run: |
+          ls spring-tool-suite-4*win*.zip*
+          rm spring-tool-suite-4*win*.zip*
           aws s3 cp s3://dist.springsource.com/sts4-distro-ci-temp/${{ github.run_id }} . --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --exclude "*/*" --no-progress
       - name: Sign EXE within zip files
         id: sign
@@ -139,7 +141,7 @@ jobs:
   cleanup:
     needs: [ sign-win-executable ]
     if: ${{ always() }}
-    runs-on: ubuntu-latest
+    runs-on: self-hosted
     steps:
       - name: Remove Temp Build Artifacts from S3
         id: cleanup-s3-temp-storage
@@ -147,4 +149,4 @@ jobs:
           AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
         run: |
-          aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp/${{ github.run_id }} --recursive --exclude "*" --include "*.zip"
+          aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp --recursive --exclude "*" --include "${{ github.run_id }}/*.zip"