From 52e296f618cb7a45e77a488bf56fb0dfc85c723c Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 20 Jul 2023 15:39:35 -0400 Subject: [PATCH 01/22] GHA: win exe sign job checkout scripts from the git repo --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index dc8af537e..10aa6b8d5 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -89,6 +89,10 @@ jobs: needs: eclipse-distro-build runs-on: self-hosted steps: + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + with: + sparse-checkout: | + .github - name: Download Win Zips from S3 for Signing env: AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }} From 1d2ec787733e8a7f23028b11db9acf53283a8e8c Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 20 Jul 2023 16:43:57 -0400 Subject: [PATCH 02/22] GHA: win exe sign script properly rm directory --- .github/scripts/sign-exe.sh | 2 +- .github/workflows/eclipse-ls-extensions-build.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/scripts/sign-exe.sh b/.github/scripts/sign-exe.sh index 02235f9e9..ef2c209bd 100755 --- a/.github/scripts/sign-exe.sh +++ b/.github/scripts/sign-exe.sh @@ -13,6 +13,6 @@ ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- /build/apps/signing/sign echo "Copying **signed** $in_filename back... (into $out_file)" scp -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo/$id/$in_filename $out_file echo "Cleaning up remote machine..." -ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm -f /opt/bamboo/$id +ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm -rf /opt/bamboo/$id echo "Successfully signed $in_filename" diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index 10bed3766..d39d69ff9 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -41,9 +41,9 @@ jobs: run: | cd headless-services if command -v xvfb-run ; then - xvfb-run ./mvnw --batch-mode clean install -DskipTests + xvfb-run ./mvnw --batch-mode clean install else - ./mvnw --batch-mode clean install -DskipTests + ./mvnw --batch-mode clean install fi - name: Install GPG key run: | From c62acb70c6fd6f3b93c6770e31881b9c9dd878e3 Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 20 Jul 2023 17:26:46 -0400 Subject: [PATCH 03/22] GHA: disable build on every push. Attempt at generating download page --- .github/workflows/gen-nighly-downloads.yml | 28 +++++++++++++++++++ .../snapshot-eclipse-ls-extensions-build.yml | 10 +++---- 2 files changed, 33 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/gen-nighly-downloads.yml diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml new file mode 100644 index 000000000..2cafe79f3 --- /dev/null +++ b/.github/workflows/gen-nighly-downloads.yml @@ -0,0 +1,28 @@ +name: Wipe out temp build artifacts + +# configure manual trigger +on: + workflow_dispatch: + +jobs: + cleanup: + runs-on: ubuntu-latest + steps: + - name: Update Nightly Distro Downloads page + 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: | + dist_path="snapshot/STS4/nightly/dist/e4.28" + downloads_html="sts4-nightly-e4.28.html" + files=`aws s3 ls s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*"` + echo '' >> $downloads_html + cat ./$downloads_html + + diff --git a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml index f398da152..c0307c642 100644 --- a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml +++ b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml @@ -4,12 +4,12 @@ concurrency: group: eclipse-ls-extension-snapshot cancel-in-progress: true -#on: -# workflow_dispatch: on: - push: - branches: - - 'main' + workflow_dispatch: +#on: +# push: +# branches: +# - 'main' jobs: eclipse-ls-extensions: From 0b9be768529e4a7fe574ed777016d91ecfb329b3 Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 20 Jul 2023 17:29:44 -0400 Subject: [PATCH 04/22] GHA: name gen html workflow --- .github/workflows/gen-nighly-downloads.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml index 2cafe79f3..88d39771f 100644 --- a/.github/workflows/gen-nighly-downloads.yml +++ b/.github/workflows/gen-nighly-downloads.yml @@ -1,11 +1,11 @@ -name: Wipe out temp build artifacts +name: Generate Nightly Downloads HTML # configure manual trigger on: workflow_dispatch: jobs: - cleanup: + gen_html: runs-on: ubuntu-latest steps: - name: Update Nightly Distro Downloads page From b68680069031187dc7876a4d423eed709729402e Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 20 Jul 2023 17:36:45 -0400 Subject: [PATCH 05/22] GHA: gen html use cp with dryrun flag --- .github/workflows/gen-nighly-downloads.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml index 88d39771f..28cf09e3b 100644 --- a/.github/workflows/gen-nighly-downloads.yml +++ b/.github/workflows/gen-nighly-downloads.yml @@ -16,7 +16,7 @@ jobs: run: | dist_path="snapshot/STS4/nightly/dist/e4.28" downloads_html="sts4-nightly-e4.28.html" - files=`aws s3 ls s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*"` + files=`aws s3 cp s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun` echo '' >> $downloads_html cat ./$downloads_html - aws s3 mv ./$downloads_html s3://dist.springsource.com/snapshot/STS4 --acl public-read --no-progress + aws s3 mv ./$downloads_html s3://dist.springsource.com/${{ input.build_type }}/STS4 --acl public-read --no-progress diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml index d02a5b0ee..dd2b37a68 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml @@ -324,6 +324,7 @@ 1.7 + generate-s3-upload-info From 956a91644f004eb4acd9fad9001a93e6f5bdaccc Mon Sep 17 00:00:00 2001 From: aboyko Date: Thu, 20 Jul 2023 23:30:55 -0400 Subject: [PATCH 12/22] GHA: fix yml syntax error cleanup steps for dmg and exe signing --- .../workflows/gh-hosted-eclipse-distro-build.yml | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index c3c276fdd..5c54d49e3 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -130,6 +130,14 @@ jobs: 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 mv . 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 + - 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/$id + rm -rf *spring-tool-suite-4*win* sign-osx-distros: needs: eclipse-distro-build @@ -210,6 +218,10 @@ jobs: aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" echo "Uploading new dmg files to s3..." aws s3 mv . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --acl public-read --no-progress + - name: cleanup + if: ${{ always() }} + run: | + rm -rf *spring-tool-suite-4*macosx* cleanup: needs: [ sign-win-distros, sign-osx-distros ] @@ -251,4 +263,4 @@ jobs: done echo '' >> $downloads_html cat ./$downloads_html - aws s3 mv ./$downloads_html s3://dist.springsource.com/${{ input.build_type }}/STS4 --acl public-read --no-progress + aws s3 mv ./$downloads_html s3://dist.springsource.com/${{ inputs.build_type }}/STS4 --acl public-read --no-progress From 929804f28bd2439fba5b2b516ac3e3e4480fa72a Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 00:05:06 -0400 Subject: [PATCH 13/22] GHA: fix yml syntax error --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 5c54d49e3..c70f9ebc9 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -240,7 +240,7 @@ jobs: with: name: s3-dist-path-${{ github.run_id }}.${{ github.run_attempt }} - name: Update Nightly Distro Downloads page - if: ${{ input.build_type == 'snapshot' }} + if: ${{ inputs.build_type == 'snapshot' }} env: AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }} AWS_SECRET_ACCESS_KEY: ${{ secrets.TOOLS_S3_SECRET_KEY }} From d0e1ea7010387f2ec39d4dca9539a1f8f39f598e Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 01:16:16 -0400 Subject: [PATCH 14/22] GHA: fix error in the cleanup script --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index c70f9ebc9..2ee151008 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -130,13 +130,13 @@ jobs: 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 mv . 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 - - name: cleanup + - 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/$id + ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- rm -rf /opt/bamboo/${{ github.run_id }} rm -rf *spring-tool-suite-4*win* sign-osx-distros: @@ -218,7 +218,7 @@ jobs: aws s3 rm s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" echo "Uploading new dmg files to s3..." aws s3 mv . s3://dist.springsource.com/${dist_path} --recursive --exclude "*" --include "spring-tool-suite-4*macosx*.dmg*" --exclude "*/*" --acl public-read --no-progress - - name: cleanup + - name: Cleanup if: ${{ always() }} run: | rm -rf *spring-tool-suite-4*macosx* From fee3c16866ba0f4ce2a94bc506bfb0efb9791ad6 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 08:33:46 -0400 Subject: [PATCH 15/22] GHA: debug uploading downloads page --- .github/workflows/gen-nighly-downloads.yml | 2 ++ .../workflows/snapshot-eclipse-ls-extensions-build.yml | 10 +++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml index 5c67bc32d..7aaed1f19 100644 --- a/.github/workflows/gen-nighly-downloads.yml +++ b/.github/workflows/gen-nighly-downloads.yml @@ -29,5 +29,7 @@ jobs: done echo '' >> $downloads_html cat ./$downloads_html + aws s3 mv ./$downloads_html s3://dist.springsource.com/snapshot/STS4 --acl public-read + diff --git a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml index f398da152..c0307c642 100644 --- a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml +++ b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml @@ -4,12 +4,12 @@ concurrency: group: eclipse-ls-extension-snapshot cancel-in-progress: true -#on: -# workflow_dispatch: on: - push: - branches: - - 'main' + workflow_dispatch: +#on: +# push: +# branches: +# - 'main' jobs: eclipse-ls-extensions: From 91ecd7c03af0f811e0d2892d505360c17b195528 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 08:36:04 -0400 Subject: [PATCH 16/22] GHA: debug uploading downloads page --- .github/workflows/gen-nighly-downloads.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml index 7aaed1f19..adc992c12 100644 --- a/.github/workflows/gen-nighly-downloads.yml +++ b/.github/workflows/gen-nighly-downloads.yml @@ -30,6 +30,7 @@ jobs: echo '' >> $downloads_html cat ./$downloads_html aws s3 mv ./$downloads_html s3://dist.springsource.com/snapshot/STS4 --acl public-read + aws s3 ls s3://dist.springsource.com/snapshot/STS4 From 8c91f71dace987e64e0b2b275a5e64b41a788087 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 08:40:11 -0400 Subject: [PATCH 17/22] GHA: debug uploading downloads page --- .github/workflows/gen-nighly-downloads.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml index adc992c12..0113e58be 100644 --- a/.github/workflows/gen-nighly-downloads.yml +++ b/.github/workflows/gen-nighly-downloads.yml @@ -29,8 +29,8 @@ jobs: done echo '' >> $downloads_html cat ./$downloads_html - aws s3 mv ./$downloads_html s3://dist.springsource.com/snapshot/STS4 --acl public-read - aws s3 ls s3://dist.springsource.com/snapshot/STS4 + aws s3 mv ./$downloads_html s3://dist.springsource.com/snapshot/STS4/ --acl public-read + aws s3 ls s3://dist.springsource.com/snapshot/STS4/ From 1148411e69b39ad97ef2e9c165cfc52da278d339 Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 08:42:45 -0400 Subject: [PATCH 18/22] GHA: fix downloads page upload --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 2 +- .../workflows/snapshot-eclipse-ls-extensions-build.yml | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 2ee151008..3224ea1eb 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -263,4 +263,4 @@ jobs: done echo '' >> $downloads_html cat ./$downloads_html - aws s3 mv ./$downloads_html s3://dist.springsource.com/${{ inputs.build_type }}/STS4 --acl public-read --no-progress + aws s3 mv ./$downloads_html s3://dist.springsource.com/${{ inputs.build_type }}/STS4/ --acl public-read --no-progress diff --git a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml index c0307c642..f398da152 100644 --- a/.github/workflows/snapshot-eclipse-ls-extensions-build.yml +++ b/.github/workflows/snapshot-eclipse-ls-extensions-build.yml @@ -4,12 +4,12 @@ concurrency: group: eclipse-ls-extension-snapshot cancel-in-progress: true -on: - workflow_dispatch: #on: -# push: -# branches: -# - 'main' +# workflow_dispatch: +on: + push: + branches: + - 'main' jobs: eclipse-ls-extensions: From 823ca7ad562e8544bf66701a556199008c20a53c Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 10:33:28 -0400 Subject: [PATCH 19/22] GHA: skip generate/upload downloads page from maven build --- .../org.springframework.boot.ide.product.e428/pom.xml | 2 -- eclipse-distribution/pom.xml | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml index dd2b37a68..d02a5b0ee 100644 --- a/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml +++ b/eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml @@ -324,7 +324,6 @@ 1.7 - generate-s3-upload-info diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 1b7fc6acc..e8b94bda8 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -146,6 +146,7 @@ ${env.tools_s3_secret_key} ${env.gpg_passphrase} ${env.gpg_keyname} + true From d1b59295a59c8110087cc70deaadfd32ac78c41c Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 13:54:58 -0400 Subject: [PATCH 20/22] GHA: convert download page update to a reusable shell script --- .../scripts/update-distro-download-page.sh | 19 ++++++++++ .../gh-hosted-eclipse-distro-build.yml | 37 +++++++++++-------- 2 files changed, 41 insertions(+), 15 deletions(-) create mode 100755 .github/scripts/update-distro-download-page.sh diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh new file mode 100755 index 000000000..7175c4ccb --- /dev/null +++ b/.github/scripts/update-distro-download-page.sh @@ -0,0 +1,19 @@ +dist_path=$1 +eclipse_version=$2 +build_type=$3 + +s3_url=s3://dist.springsource.com/${dist_path} +downloads_html="sts4-nightly-${eclipse_version}.html" +files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun` +echo '' >> $downloads_html +cat ./$downloads_html +aws s3 mv ./$downloads_html s3://dist.springsource.com/${build_type}/STS4/ --acl public-read --no-progress diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 3224ea1eb..5da520245 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -236,6 +236,10 @@ jobs: AWS_DEFAULT_REGION: us-east-1 run: | aws s3 rm s3://dist.springsource.com/sts4-distro-ci-temp --recursive --exclude "*" --include "${{ github.run_id }}/*" + - uses: actions/checkout@c85c95e3d7251135ab7dc9ce3241c5835cc595a9 + with: + sparse-checkout: | + .github - uses: actions/download-artifact@cbed621e49e4c01b044d60f6c80ea4ed6328b281 with: name: s3-dist-path-${{ github.run_id }}.${{ github.run_attempt }} @@ -247,20 +251,23 @@ jobs: AWS_DEFAULT_REGION: us-east-1 run: | dist_path=`cat s3-dist-path.txt` - s3_url=s3://dist.springsource.com/${dist_path} eclipse_profile=${{ inputs.eclipse_profile }} eclipse_version=${eclipse_profile:0:2}.${eclipse_profile:2} - downloads_html="sts4-nightly-${eclipse_version}.html" - files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun` - echo '' >> $downloads_html - cat ./$downloads_html - aws s3 mv ./$downloads_html s3://dist.springsource.com/${{ inputs.build_type }}/STS4/ --acl public-read --no-progress + ${{ github.workspace }}/.github/scripts/update-distro-download-page.sh $dist_path $eclipse_version ${{ inputs.build_type }} +# s3_url=s3://dist.springsource.com/${dist_path} +# eclipse_profile=${{ inputs.eclipse_profile }} +# eclipse_version=${eclipse_profile:0:2}.${eclipse_profile:2} +# downloads_html="sts4-nightly-${eclipse_version}.html" +# files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun` +# echo '' >> $downloads_html +# cat ./$downloads_html +# aws s3 mv ./$downloads_html s3://dist.springsource.com/${{ inputs.build_type }}/STS4/ --acl public-read --no-progress From 612ba1c413b203d78e3b7a0babfaa5ffb4ebca9d Mon Sep 17 00:00:00 2001 From: aboyko Date: Fri, 21 Jul 2023 15:45:27 -0400 Subject: [PATCH 21/22] GHA: minimize nightly distro downloads page broken links state --- .../scripts/update-distro-download-page.sh | 1 + .../gh-hosted-eclipse-distro-build.yml | 69 +++++++++---------- 2 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh index 7175c4ccb..0ac114b5b 100755 --- a/.github/scripts/update-distro-download-page.sh +++ b/.github/scripts/update-distro-download-page.sh @@ -5,6 +5,7 @@ build_type=$3 s3_url=s3://dist.springsource.com/${dist_path} downloads_html="sts4-nightly-${eclipse_version}.html" files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tool-suite-4*.zip" --include "spring-tool-suite-4*.dmg" --include "spring-tool-suite-4*.self-extracting.jar" --include "spring-tool-suite-4*.tar.gz" --exclude "*/*" --dryrun` +rm -f ./${downloads_html} echo '