From 2d00f324823674da18c0ef0606d0e7df828a82de Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 24 Jul 2025 15:46:53 -0700 Subject: [PATCH 01/11] [GHA] Eclipse LS extensions URL changes Signed-off-by: BoykoAlex --- .../workflows/eclipse-ls-extensions-build.yml | 15 +++++------ .../pom.xml | 27 ------------------- 2 files changed, 7 insertions(+), 35 deletions(-) diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index 73fa00557a..eb9faa21dd 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -76,21 +76,20 @@ jobs: gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }} gpg_keyname: ${{ secrets.GPG_KEYID }} run: | - sts_ls_version=${{ inputs.sts-language-servers-version }} - sts_ls_version_param="" - if ! [[ -z ${sts_ls_version} ]]; then - sts_ls_version_param="-Ddist.version=${sts_ls_version}" - fi cd eclipse-language-servers if command -v xvfb-run ; then - xvfb-run ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore + xvfb-run ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore else - ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore + ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore fi - name: Upload P2 Repo to S3 id: upload-p2 run: | - p2_path=`cat ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/s3-p2-repo-dist-path.txt` + sts_ls_version=${{ inputs.sts-language-servers-version }} + if [[ -z ${sts_ls_version} ]]; then + sts_ls_version=nightly + fi + p2_path=${{ inputs.build_type }}/language-server-integrations/ echo "p2_path=$p2_path" >> $GITHUB_OUTPUT echo "P2 path: ${p2_path}" aws s3 rm s3://$AWS_S3_BUCKET/${p2_path}/ --recursive diff --git a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml index 7d8cc3c71e..f4be14c2bd 100644 --- a/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml +++ b/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/pom.xml @@ -15,33 +15,6 @@ sts5-language-server-integrations - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - generate-s3-upload-info - verify - - - - ${dist.path} - - - - - run - - - - - - - gpg.sign From e2ca86a567715b1d169dd7c5deccb373cef5b91d Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 24 Jul 2025 17:26:46 -0700 Subject: [PATCH 02/11] [GHA] Eclipse Distro builds Signed-off-by: BoykoAlex --- .../gh-hosted-eclipse-distro-build.yml | 18 ++++++++++++++++-- eclipse-distribution/pom.xml | 2 +- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index e10b85ac40..69cb0d4924 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -103,8 +103,22 @@ jobs: - name: Store S3 Paths id: s3-paths run: | - dist_path=`cat ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/s3-dist-path.txt` - p2_path=`cat ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/s3-p2-repo-dist-path.txt` + eclipse_version=${eclipse_profile:0:2}.${eclipse_profile:2} + build_type=${{ inputs.build_type }} + if [[ "$build_type" == "snapshot" ]]; then + dist_path=${{ inputs.build_type }}/dist/$eclipse_version + p2_path=${{ inputs.build_type }}/update/$eclipse_version + else + cd eclipse-distributions + version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) + version_segment="${version%%-*}" + p2_qualifier=${{ inputs.p2-qualifier }} + if ! [[ -z ${p2_qualifier} ]]; then + version_segment="${version_segment}.${p2_qualifier} + fi + dist_path=${{ inputs.build_type }}/dist/$version_segment/$eclipse_version + p2_path=${{ inputs.build_type }}/update/$version_segment/$eclipse_version + fi echo "dist_path=$dist_path" >> $GITHUB_OUTPUT echo "p2_path=$p2_path" >> $GITHUB_OUTPUT - name: Upload P2 Repo Build Artifacts diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 5667ddc053..3741548e50 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -76,7 +76,7 @@ nightly ${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix} - https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts-language-servers-version} + https://cdn.spring.io/spring-tools/${dist.type}/language-server-integrations/${sts-language-servers-version} 4.0.12 UTF-8 From f7417f251f334118fed79ef6af44338f0d26baac Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 24 Jul 2025 19:18:51 -0700 Subject: [PATCH 03/11] [GHA] Adjust p2 path for ls eclipse extensions Signed-off-by: BoykoAlex --- .github/workflows/eclipse-ls-extensions-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index eb9faa21dd..5a4eee3fa7 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -89,7 +89,7 @@ jobs: if [[ -z ${sts_ls_version} ]]; then sts_ls_version=nightly fi - p2_path=${{ inputs.build_type }}/language-server-integrations/ + p2_path=${{ inputs.build_type }}/language-server-integrations echo "p2_path=$p2_path" >> $GITHUB_OUTPUT echo "P2 path: ${p2_path}" aws s3 rm s3://$AWS_S3_BUCKET/${p2_path}/ --recursive From d2ecab42909e22760b7117fe01614db390766425 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 24 Jul 2025 21:01:56 -0700 Subject: [PATCH 04/11] [GHA] Adjust p2 path for ls eclipse extensions Signed-off-by: BoykoAlex --- .github/workflows/eclipse-ls-extensions-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index 5a4eee3fa7..bd2234c659 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -89,7 +89,7 @@ jobs: if [[ -z ${sts_ls_version} ]]; then sts_ls_version=nightly fi - p2_path=${{ inputs.build_type }}/language-server-integrations + p2_path=${{ inputs.build_type }}/language-server-integrations/$sts_ls_version echo "p2_path=$p2_path" >> $GITHUB_OUTPUT echo "P2 path: ${p2_path}" aws s3 rm s3://$AWS_S3_BUCKET/${p2_path}/ --recursive From 41afb13fcd5b2260bd41cdc61889804a66093b34 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 25 Jul 2025 10:51:59 -0700 Subject: [PATCH 05/11] [GHA] Corrections Signed-off-by: BoykoAlex --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 69cb0d4924..9fa8d9a7ff 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -109,12 +109,9 @@ jobs: dist_path=${{ inputs.build_type }}/dist/$eclipse_version p2_path=${{ inputs.build_type }}/update/$eclipse_version else - cd eclipse-distributions - version=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout) - version_segment="${version%%-*}" p2_qualifier=${{ inputs.p2-qualifier }} if ! [[ -z ${p2_qualifier} ]]; then - version_segment="${version_segment}.${p2_qualifier} + version_segment=${{ steps.project-version.outputs.version }}.$p2_qualifier fi dist_path=${{ inputs.build_type }}/dist/$version_segment/$eclipse_version p2_path=${{ inputs.build_type }}/update/$version_segment/$eclipse_version From ad70a2067e212a72f1fef5d4465027f73bf10511 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 25 Jul 2025 12:08:24 -0700 Subject: [PATCH 06/11] [GHA] Corrections Signed-off-by: BoykoAlex --- .github/workflows/gh-hosted-eclipse-distro-build.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 9fa8d9a7ff..023178bcf5 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -103,9 +103,10 @@ jobs: - name: Store S3 Paths id: s3-paths run: | + eclipse_profile=${{ inputs.eclipse_profile }} eclipse_version=${eclipse_profile:0:2}.${eclipse_profile:2} build_type=${{ inputs.build_type }} - if [[ "$build_type" == "snapshot" ]]; then + if [[ "${build_type}" == "snapshot" ]]; then dist_path=${{ inputs.build_type }}/dist/$eclipse_version p2_path=${{ inputs.build_type }}/update/$eclipse_version else From e3ae323bf1a0b7c705710e2c9a0717bc1976369c Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 25 Jul 2025 14:27:32 -0700 Subject: [PATCH 07/11] [GHA] Corrections Signed-off-by: BoykoAlex --- .../workflows/eclipse-ls-extensions-build.yml | 5 +++-- .../workflows/upload-nightly-downloads-page.yml | 12 ++++++------ .../common/html/nightly-distributions.html | 16 ++++++++-------- eclipse-distribution/pom.xml | 5 ----- 4 files changed, 17 insertions(+), 21 deletions(-) diff --git a/.github/workflows/eclipse-ls-extensions-build.yml b/.github/workflows/eclipse-ls-extensions-build.yml index bd2234c659..dcd3a2c147 100644 --- a/.github/workflows/eclipse-ls-extensions-build.yml +++ b/.github/workflows/eclipse-ls-extensions-build.yml @@ -87,9 +87,10 @@ jobs: run: | sts_ls_version=${{ inputs.sts-language-servers-version }} if [[ -z ${sts_ls_version} ]]; then - sts_ls_version=nightly + p2_path=${{ inputs.build_type }}/language-server-integrations + else + p2_path=${{ inputs.build_type }}/language-server-integrations/$sts_ls_version fi - p2_path=${{ inputs.build_type }}/language-server-integrations/$sts_ls_version echo "p2_path=$p2_path" >> $GITHUB_OUTPUT echo "P2 path: ${p2_path}" aws s3 rm s3://$AWS_S3_BUCKET/${p2_path}/ --recursive diff --git a/.github/workflows/upload-nightly-downloads-page.yml b/.github/workflows/upload-nightly-downloads-page.yml index b7da9f483d..b0589077b5 100644 --- a/.github/workflows/upload-nightly-downloads-page.yml +++ b/.github/workflows/upload-nightly-downloads-page.yml @@ -32,9 +32,9 @@ jobs: run: | echo "Removing old nightly-distributions.html from s3..." - aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/nightly-distributions.html --debug --cli-connect-timeout 60 - aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/stylesheet.css --debug --cli-connect-timeout 60 - aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/jquery-2.0.3.min.js --debug --cli-connect-timeout 60 + aws s3 rm s3://$AWS_S3_BUCKET/snapshot/nightly-distributions.html --debug --cli-connect-timeout 60 + aws s3 rm s3://$AWS_S3_BUCKET/snapshot/stylesheet.css --debug --cli-connect-timeout 60 + aws s3 rm s3://$AWS_S3_BUCKET/snapshot/jquery-2.0.3.min.js --debug --cli-connect-timeout 60 aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --debug --cli-connect-timeout 60 aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --debug --cli-connect-timeout 60 @@ -42,9 +42,9 @@ jobs: echo "Uploading new nightly-distributions.html to s3..." - aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://$AWS_S3_BUCKET/snapshot/STS5/nightly-distributions.html --no-progress --checksum-algorithm CRC32 - aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/STS5/stylesheet.css --no-progress --checksum-algorithm CRC32 - aws s3 cp ./eclipse-distribution/common/html/jquery-2.0.3.min.js s3://$AWS_S3_BUCKET/snapshot/STS5/jquery-2.0.3.min.js --no-progress --checksum-algorithm CRC32 + aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://$AWS_S3_BUCKET/snapshot/nightly-distributions.html --no-progress --checksum-algorithm CRC32 + aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/stylesheet.css --no-progress --checksum-algorithm CRC32 + aws s3 cp ./eclipse-distribution/common/html/jquery-2.0.3.min.js s3://$AWS_S3_BUCKET/snapshot/jquery-2.0.3.min.js --no-progress --checksum-algorithm CRC32 aws s3 cp ./eclipse-distribution/common/html/nightly-distributions-4.html s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --no-progress --checksum-algorithm CRC32 aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --no-progress --checksum-algorithm CRC32 diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html index 9ef3141bd9..afeb35d5bc 100644 --- a/eclipse-distribution/common/html/nightly-distributions.html +++ b/eclipse-distribution/common/html/nightly-distributions.html @@ -2,7 +2,7 @@ - Spring Tools 5 - Internal CI builds + Spring Tools - Internal CI builds @@ -13,28 +13,28 @@
-

Spring Tools 5 - Internal CI builds

+

Spring Tools - Internal CI builds

Eclipse p2 repositories

Note: please do NOT use your browser to access these p2 repositories directly, there is no web index content being served. - Instead add them to the available update sites in your Eclipse/STS preferences or paste them into the "Install New Software" dialog. + Instead, add them to the available update sites in your Eclipse preferences or paste them into the "Install New Software" dialog.

STS5 Distributions:

-

STS5 language server extensions (this repository is meant to be used to ship updates of the language server extensions to existing STS4 installations. In production, the release version of this repository is used.) +

Spring Tools language server extensions (this repository is meant to be used to ship updates of the language server extensions to existing Spring Tools installations. In production, the release version of this repository is used.)

diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index 3741548e50..dd7c3be0ba 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -94,8 +94,6 @@ ${dist.type}/TOOLS/sts5/nightly/${dist.target.major} ${dist.type}/STS5/nightly/dist/${dist.target.major} false - - nightly @@ -106,8 +104,6 @@ ${dist.type}/TOOLS/sts4/update/${unqualifiedVersion}.${p2.qualifier}/${dist.target.major} ${dist.type}/STS4/${unqualifiedVersion}.${p2.qualifier}/dist/${dist.target.major} true - - today @@ -117,7 +113,6 @@ release ${dist.type}/TOOLS/sts4/update/${unqualifiedVersion}.${p2.qualifier}/${dist.target.major} ${dist.type}/STS4/${unqualifiedVersion}.${p2.qualifier}/dist/${dist.target.major} - today From c973e278202394c14d5539fc5e5ff2979b098c03 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 25 Jul 2025 14:31:02 -0700 Subject: [PATCH 08/11] [GHA] Correct the distro download page location Signed-off-by: BoykoAlex --- .github/scripts/update-distro-download-page.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/update-distro-download-page.sh b/.github/scripts/update-distro-download-page.sh index d154b6e06c..d19039d732 100755 --- a/.github/scripts/update-distro-download-page.sh +++ b/.github/scripts/update-distro-download-page.sh @@ -23,4 +23,4 @@ do done echo '' >> $downloads_html cat ./$downloads_html -aws s3 mv ./$downloads_html s3://${s3_bucket}/${build_type}/STS5/ --no-progress +aws s3 mv ./$downloads_html s3://${s3_bucket}/${build_type}/ --no-progress From 0f1b2927b48d26572d3ddf44de9d7dc10ed477b1 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 25 Jul 2025 15:44:49 -0700 Subject: [PATCH 09/11] [GHA] Correct the p2 url for ls extensions Signed-off-by: BoykoAlex --- eclipse-distribution/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml index dd7c3be0ba..12f8babd40 100644 --- a/eclipse-distribution/pom.xml +++ b/eclipse-distribution/pom.xml @@ -76,6 +76,7 @@ nightly ${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix} + https://cdn.spring.io/spring-tools/${dist.type}/language-server-integrations/${sts-language-servers-version} 4.0.12 From 70dbe0f3f9dc6d69cda96421d4e32f770c055917 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Sun, 27 Jul 2025 13:26:05 -0700 Subject: [PATCH 10/11] [GHA] VSCode extensions links on the download page Signed-off-by: BoykoAlex --- .github/workflows/snapshot-vscode-extension.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/snapshot-vscode-extension.yml b/.github/workflows/snapshot-vscode-extension.yml index 1e3bc8333b..f1aafc845c 100644 --- a/.github/workflows/snapshot-vscode-extension.yml +++ b/.github/workflows/snapshot-vscode-extension.yml @@ -64,5 +64,5 @@ jobs: echo `${{ github.workspace }}/.github/scripts/gen-vscode-link-bullet.sh vscode-spring-cli "Spring CLI" $DOWNLOAD_URL_ROOT` >> $downloads_html echo '' >> $downloads_html cat ./$downloads_html - aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/STS5/vscode-extensions/ --no-progress --checksum-algorithm CRC32 + aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/vscode-extensions/ --no-progress --checksum-algorithm CRC32 From 52d11fdd823c5ed72b25385e4bfd79ff6e8ddb5d Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Sun, 27 Jul 2025 14:58:04 -0700 Subject: [PATCH 11/11] [GHA] Aggregate update sites and backup Signed-off-by: BoykoAlex --- .../aggregate-distro-update-sites.yml | 28 +++++++++---------- .../aggregate-ls-extensions-update-site.yml | 14 +++++----- .../backup-eclipse-releases-to-gcp.yml | 6 ++-- .github/workflows/gen-nighly-downloads.yml | 6 ++-- .../gh-hosted-eclipse-distro-build.yml | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/aggregate-distro-update-sites.yml b/.github/workflows/aggregate-distro-update-sites.yml index e393a722bd..f845bcf3e9 100644 --- a/.github/workflows/aggregate-distro-update-sites.yml +++ b/.github/workflows/aggregate-distro-update-sites.yml @@ -51,7 +51,7 @@ jobs: CLOUDFLARE_CACHE_TOKEN: ${{ secrets.CLOUDFLARE_CACHE_TOKEN }} run: | echo "S3 Aggregate Update Sites Creation..." - dirs=`aws s3 ls s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${{ inputs.version }}/` + dirs=`aws s3 ls s3://${AWS_S3_BUCKET}/release/update/${{ inputs.version }}/` echo "${dirs}" pattern='^e[0-9]+.[0-9]+/$' invalid_urls="" @@ -60,25 +60,25 @@ jobs: if [[ "$dir" =~ $pattern ]]; then echo "Found ${dir}" dir_name=${dir:0:-1} - site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${{ inputs.version }}/${dir_name}" + site_url="${DOWNLOAD_URL_ROOT}/release/update/${{ inputs.version }}/${dir_name}" ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url $dir_name cat ./compositeArtifacts.xml cat ./compositeContent.xml if [[ ${dir_name} == ${{ inputs.latest }} ]]; then - aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/compositeArtifacts.xml " - aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/compositeContent.xml " - aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/p2.index " + aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/update/latest/ --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/update/latest/compositeArtifacts.xml " + aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/update/latest/ --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/update/latest/compositeContent.xml " + aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/update/latest/ --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/update/latest/p2.index " echo "TODO: Purge Cache" fi - aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/compositeArtifacts.xml " - aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/compositeContent.xml " - aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/p2.index " + aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/update/${dir} --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/update/${dir_name}/compositeArtifacts.xml " + aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/update/${dir} --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/update/${dir_name}/compositeContent.xml " + aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/update/${dir} --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/update/${dir_name}/p2.index " fi done echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT diff --git a/.github/workflows/aggregate-ls-extensions-update-site.yml b/.github/workflows/aggregate-ls-extensions-update-site.yml index e0df6b5ef5..e802307ec3 100644 --- a/.github/workflows/aggregate-ls-extensions-update-site.yml +++ b/.github/workflows/aggregate-ls-extensions-update-site.yml @@ -35,16 +35,16 @@ jobs: run: | echo "S3 Aggregate Update Sites Creation..." invalid_urls="" - site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/${{ inputs.version }}" + site_url="${DOWNLOAD_URL_ROOT}/release/language-server-integrations/${{ inputs.version }}" ${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url cat ./compositeArtifacts.xml cat ./compositeContent.xml - aws s3 cp ./compositeArtifacts.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/compositeArtifacts.xml " - aws s3 cp ./compositeContent.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/compositeContent.xml " - aws s3 cp ./p2.index s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32 - invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/p2.index" + aws s3 cp ./compositeArtifacts.xml s3://$AWS_S3_BUCKET/release/language-server-integrations/ --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/language-server-integrations/compositeArtifacts.xml " + aws s3 cp ./compositeContent.xml s3://$AWS_S3_BUCKET/release/language-server-integrations/ --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/language-server-integrations/compositeContent.xml " + aws s3 cp ./p2.index s3://$AWS_S3_BUCKET/release/language-server-integrations/ --checksum-algorithm CRC32 + invalid_urls+="${DOWNLOAD_URL_ROOT}/release/language-server-integrations/p2.index" echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT - uses: ./.github/actions/cloudflare-purge name: Invalidate URLs diff --git a/.github/workflows/backup-eclipse-releases-to-gcp.yml b/.github/workflows/backup-eclipse-releases-to-gcp.yml index 9d2e044079..6a4c8f22f6 100644 --- a/.github/workflows/backup-eclipse-releases-to-gcp.yml +++ b/.github/workflows/backup-eclipse-releases-to-gcp.yml @@ -44,13 +44,13 @@ jobs: - name: Copy from S3 to GCP run: | echo "Copying Eclipse LS extensions ${{ inputs.ls_version }} to GCP..." - url_path=spring-tools/release/TOOLS/sts4-language-server-integrations/${{ inputs.ls_version }} + url_path=spring-tools/release/language-server-integrations/${{ inputs.ls_version }} gcloud storage cp s3://$AWS_S3_BUCKET/$url_path $GCP_BUCKET/$url_path --recursive echo "Copying Eclipse Distro P2 repos ${{ inputs.release_version }} to GCP..." - url_path=spring-tools/release/TOOLS/sts4/update/${{ inputs.release_version }} + url_path=spring-tools/release/update/${{ inputs.release_version }} gcloud storage cp s3://$AWS_S3_BUCKET/$url_path $GCP_BUCKET/$url_path --recursive echo "Copying Eclipse Distros ${{ inputs.release_version }} to GCP..." - url_path=spring-tools/release/STS4/${{ inputs.release_version }}/dist + url_path=spring-tools/release/dist/${{ inputs.release_version }} gcloud storage cp s3://$AWS_S3_BUCKET/$url_path $GCP_BUCKET/$url_path --recursive diff --git a/.github/workflows/gen-nighly-downloads.yml b/.github/workflows/gen-nighly-downloads.yml index 3a2bce2100..19780fda01 100644 --- a/.github/workflows/gen-nighly-downloads.yml +++ b/.github/workflows/gen-nighly-downloads.yml @@ -17,9 +17,9 @@ jobs: steps: - name: Update Nightly Distro Downloads page run: | - dist_path="snapshot/STS4/nightly/dist/e4.32" + dist_path="snapshot/dist/e4.32" s3_url=s3://$AWS_S3_BUCKET/${dist_path}/ - downloads_html="sts4-nightly-e4.32.html" + downloads_html="sts-nightly-e4.32.html" files=`aws s3 cp ${s3_url} . --recursive --exclude "*" --include "spring-tools-for-eclipse*.zip" --include "spring-tools-for-eclipse*.dmg" --include "spring-tools-for-eclipse*.self-extracting.jar" --include "spring-tools-for-eclipse*.tar.gz" --exclude "*/*" --dryrun` echo '
    ' >> $downloads_html s3_url_prefix="s3://${AWS_S3_BUCKET}" @@ -34,7 +34,7 @@ jobs: done echo '
' >> $downloads_html cat ./$downloads_html - aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/STS4/ --dryrun + aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/ --dryrun files=`aws s3 ls ${s3_url}` for file in $files do diff --git a/.github/workflows/gh-hosted-eclipse-distro-build.yml b/.github/workflows/gh-hosted-eclipse-distro-build.yml index 023178bcf5..335779323e 100644 --- a/.github/workflows/gh-hosted-eclipse-distro-build.yml +++ b/.github/workflows/gh-hosted-eclipse-distro-build.yml @@ -14,7 +14,7 @@ on: default: 'snapshot' type: string sts-language-servers-version: - description: version of sts4 ls extensions + description: version of sts ls extensions required: false type: string p2-qualifier: