From 7bbdba9f93f39bdda52db07c53185761a1119509 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 14 Jul 2023 16:02:28 -0400 Subject: [PATCH] GH-Hosted: Debug zip creation --- .github/scripts/sign-exe-in-zip-file.sh | 5 +++++ .../workflows/gh-hosted-eclipse-distro-build.yml | 15 ++------------- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/scripts/sign-exe-in-zip-file.sh b/.github/scripts/sign-exe-in-zip-file.sh index 6dc5c7712..43f71e440 100755 --- a/.github/scripts/sign-exe-in-zip-file.sh +++ b/.github/scripts/sign-exe-in-zip-file.sh @@ -12,7 +12,12 @@ unzip -q $file -d ./${destination_folder_name} echo "Successfully extracted ${filename}" sts_folder=`find ./${destination_folder_name} -maxdepth 1 -type d -name 'sts-*' -print -quit` echo "Found STS distro folder: ${sts_folder}" +echo "About to sign win exe file: ./${sts_folder}/SpringToolSuite4.exe" ${workdir}/.github/scripts/sign-exe.sh ./${sts_folder}/SpringToolSuite4.exe ${sts_folder}/SpringToolSuite4.exe + +echo "Contents of ${destination_folder_name}" +ls ./${destination_folder_name} + echo "Adding to zip contents of a folder ${destination_folder_name}" zip -r -q $file ./${destination_folder_name} echo "Successfully zipped ${destination_folder_name} into ${file}" diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index a85b0a1ae..a394b38ed 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -128,21 +128,10 @@ jobs: AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY }} run: | dist_path=`cat s3-dist-path.txt` - - echo "S3 contents:" - aws s3 ls s3://dist.springsource.com/${dist_path} - echo "Processing S3 update..." - ls spring-tool-suite-4*win*.zip* ls spring-tool-suite-4*win*.self-extracting.jar* echo "Removing old win zip and self extracting jar files from s3..." - aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" + aws s3 rm s3://dist.springsource.com/${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 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --acl public-read - -# ls spring-tool-suite-4*win*.jar* -# echo "Removing old self extractable win jar files from s3..." -# aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.jar*" -# echo "Uploading new self extractable win jar files to s3..." -# aws s3 cp s3://dist.springsource.com/${dist_path} . --recursive --exclude "*" --include "spring-tool-suite-4*win*.jar*" --acl public-read + aws s3 cp . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*win*.zip*" --include "spring-tool-suite-4*win*.self-extracting.jar*" --exclude "*/*" --acl public-read --no-progress true