From 6d0b8e94acb84cff9105edbcb63f946764445450 Mon Sep 17 00:00:00 2001
From: aboyko <aboyko@vmware.com>
Date: Wed, 19 Jul 2023 09:08:14 -0400
Subject: [PATCH] GHA: correct errors

---
 .github/workflows/gh-hosted-eclipse-distro-build.yml | 7 ++++---
 .github/workflows/wipe-out-temp-build-artifacts.yml  | 1 -
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index c5c4b7f51..f436eb892 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -108,7 +108,7 @@ jobs:
         run: |
           rm spring-tool-suite-4*win*.zip*
           rm spring-tool-suite-4*win*.self-extracting.jar*
-          ls *win*
+          ls
           aws s3 mv 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
@@ -142,12 +142,13 @@ jobs:
   cleanup:
     needs: [ sign-win-executable ]
     if: ${{ always() }}
-    runs-on: self-hosted
+    runs-on: ubuntu-latest
     steps:
       - name: Remove Temp Build Artifacts from S3
         id: cleanup-s3-temp-storage
         env:
           AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
+          AWS_DEFAULT_REGION: us-east-1
         run: |
-          aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp --recursive --exclude "*" --include "${{ github.run_id }}/*.zip"
+          aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp --recursive --exclude "*" --include "${{ github.run_id }}/*"
diff --git a/.github/workflows/wipe-out-temp-build-artifacts.yml b/.github/workflows/wipe-out-temp-build-artifacts.yml
index 42fda01f3..9e131d851 100644
--- a/.github/workflows/wipe-out-temp-build-artifacts.yml
+++ b/.github/workflows/wipe-out-temp-build-artifacts.yml
@@ -19,6 +19,5 @@ jobs:
           AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY  }}
           AWS_DEFAULT_REGION: us-east-1
         run: |
-          echo $AWS_DEFAULT_REGION
           aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp --recursive --exclude "*" --include "*.zip"