From 6d3b8af79e49519ad195031f57130b816bb36160 Mon Sep 17 00:00:00 2001
From: aboyko <alex.boyko@broadcom.com>
Date: Thu, 7 Nov 2024 00:53:50 -0500
Subject: [PATCH] [GHA] polish up

---
 .github/scripts/sign-exe.sh                   |  4 +-
 .../gh-hosted-eclipse-distro-build.yml        | 53 +------------------
 2 files changed, 3 insertions(+), 54 deletions(-)

diff --git a/.github/scripts/sign-exe.sh b/.github/scripts/sign-exe.sh
index b53b0deaa..997e3f7d3 100755
--- a/.github/scripts/sign-exe.sh
+++ b/.github/scripts/sign-exe.sh
@@ -7,7 +7,7 @@ timeout=$5
 
 in_filename="$(basename -- $in_file)"
 echo "Copying ${in_file} to s3 s3://${AWS_S3_BUCKET}/exes-to-sign/${id}.exe for signing"
-aws s3 cp $in_file s3://$AWS_S3_BUCKET/exes-to-sign/$id.exe
+aws s3 cp $in_file s3://$AWS_S3_BUCKET/exes-to-sign/$id.exe --no-progress
 for (( i=wait_time; i<timeout; i+=wait_time )) ; {
   sleep $wait_time
   object_exists=$(aws s3api head-object --bucket $CDN_BUCKET --key spring-tools/exes-signed/$id.exe || true)
@@ -18,5 +18,5 @@ for (( i=wait_time; i<timeout; i+=wait_time )) ; {
     break
   fi
 }
-aws s3 mv s3://$AWS_S3_BUCKET/exes-signed/$id.exe $out_file
+aws s3 mv s3://$AWS_S3_BUCKET/exes-signed/$id.exe $out_file --no-progress
 
diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml
index ecfa32f4f..447716dbc 100644
--- a/.github/workflows/gh-hosted-eclipse-distro-build.yml
+++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml
@@ -166,7 +166,7 @@ jobs:
           rm -f spring-tool-suite-4*win*.zip*
           rm -f spring-tool-suite-4*win*.self-extracting.jar*
           ls
-          aws s3 mv s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --exclude "*/*"
+          aws s3 mv s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --exclude "*/*" --no-progress
       - name: Sign EXE within zip files
         id: sign
         run: |
@@ -193,57 +193,6 @@ jobs:
           eclipse_version=${eclipse_profile:0:2}.${eclipse_profile:2}
           ${{ github.workspace }}/.github/scripts/update-distro-download-page.sh $dist_path $eclipse_version ${{ inputs.build_type }} $AWS_S3_BUCKET $DOWNLOAD_URL_ROOT
 
-#  sign-win-distros:
-#    needs: [ eclipse-distro-build ]
-#    runs-on: [ self-hosted, Linux ]
-#    steps:
-#      - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9
-#        with:
-#          sparse-checkout: |
-#            .github
-#      - name: Download Win Zips from S3 for Signing
-#        run: |
-#          rm -f spring-tool-suite-4*win*.zip*
-#          rm -f spring-tool-suite-4*win*.self-extracting.jar*
-#          ls
-#          aws s3 mv s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --exclude "*/*"
-#      - name: Sign EXE within zip files
-#        id: sign
-#        env:
-#          SSH_KEY: ~/.ssh/id_rsa
-#          SSH_USER: signer
-#        run: |
-#          files=`ls spring-tool-suite-4*win*.zip`
-#          for file in $files
-#          do
-#            ${{ github.workspace }}/.github/scripts/sign-exe-in-zip-file.sh $file ${{ github.workspace }}/.github/scripts/sign-exe.sh ${{ github.workspace }}/.github/scripts/self-extracting-jar-creator.jar ${{ needs.eclipse-distro-build.outputs.id }}
-#          done
-#      - name: Update Win zip/jar on S3
-#        id: update-s3
-#        run: |
-#          dist_path=${{ needs.eclipse-distro-build.outputs.dist_path }}
-#          echo "Processing S3 update..."
-#          ls spring-tool-suite-4*win*
-#          echo "Removing old win zip and self extracting jar files from S3..."
-#          aws s3 rm s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*"
-#          echo "Uploading new win zip and self extracting jar files to S3..."
-#          aws s3 mv . s3://$AWS_S3_BUCKET/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" --no-progress
-#      - name: Update Nightly Distro Downloads page
-#        if: ${{ inputs.build_type == 'snapshot' }}
-#        run: |
-#          dist_path=${{ needs.eclipse-distro-build.outputs.dist_path }}
-#          eclipse_profile=${{ inputs.eclipse_profile }}
-#          eclipse_version=${eclipse_profile:0:2}.${eclipse_profile:2}
-#          ${{ github.workspace }}/.github/scripts/update-distro-download-page.sh $dist_path $eclipse_version ${{ inputs.build_type }} $AWS_S3_BUCKET $DOWNLOAD_URL_ROOT
-#      - name: Cleanup
-#        if: ${{ always() }}
-#        env:
-#          SSH_KEY: ~/.ssh/id_rsa
-#          SSH_USER: signer
-#        run: |
-#          ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm -rf /opt/bamboo/${{ needs.eclipse-distro-build.outputs.id }}
-#          rm -rf *spring-tool-suite-4*win*
-
   sign-osx-distros:
     needs: [ eclipse-distro-build ]
     runs-on: macos-14