Skip to content

Commit 615c168

Browse files
BoykoAlexBoykoAlex
authored
5.x (#1590)
* Update to 5.x and 2.x Signed-off-by: BoykoAlex <[email protected]> * Update CI Signed-off-by: BoykoAlex <[email protected]> * Update CSS and JQuery Signed-off-by: BoykoAlex <[email protected]> * Adjust distro links files Signed-off-by: BoykoAlex <[email protected]> * Adjust CI concurrency Signed-off-by: BoykoAlex <[email protected]> * Adjust STS5 nightly builds page Signed-off-by: BoykoAlex <[email protected]> --------- Signed-off-by: BoykoAlex <[email protected]>
1 parent 4a52ea9 commit 615c168

File tree

160 files changed

+360
-274
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

160 files changed

+360
-274
lines changed

‎.github/scripts/update-distro-download-page.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ s3_bucket=$4
77
download_url_root=$5
88

99
s3_url=s3://${s3_bucket}/${dist_path}
10-
downloads_html="sts4-nightly-${eclipse_version}.html"
10+
downloads_html="sts-nightly-${eclipse_version}.html"
1111
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`
1212
rm -f ./${downloads_html}
1313
echo '<ul>' >> $downloads_html
@@ -23,4 +23,4 @@ do
2323
done
2424
echo '</ul>' >> $downloads_html
2525
cat ./$downloads_html
26-
aws s3 mv ./$downloads_html s3://${s3_bucket}/${build_type}/STS4/ --no-progress
26+
aws s3 mv ./$downloads_html s3://${s3_bucket}/${build_type}/STS5/ --no-progress

‎.github/workflows/aggregate-distro-update-sites.yml‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,25 +60,25 @@ jobs:
6060
if [[ "$dir" =~ $pattern ]]; then
6161
echo "Found ${dir}"
6262
dir_name=${dir:0:-1}
63-
site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${{ inputs.version }}/${dir_name}"
63+
site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${{ inputs.version }}/${dir_name}"
6464
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url $dir_name
6565
cat ./compositeArtifacts.xml
6666
cat ./compositeContent.xml
6767
if [[ ${dir_name} == ${{ inputs.latest }} ]]; then
68-
aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
69-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeArtifacts.xml "
70-
aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
71-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/compositeContent.xml "
72-
aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/latest/ --checksum-algorithm CRC32
73-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/latest/p2.index "
68+
aws s3 cp ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32
69+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/compositeArtifacts.xml "
70+
aws s3 cp ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32
71+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/compositeContent.xml "
72+
aws s3 cp ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/latest/ --checksum-algorithm CRC32
73+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/latest/p2.index "
7474
echo "TODO: Purge Cache"
7575
fi
76-
aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
77-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeArtifacts.xml "
78-
aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
79-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/compositeContent.xml "
80-
aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts4/update/${dir} --checksum-algorithm CRC32
81-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4/update/${dir_name}/p2.index "
76+
aws s3 mv ./compositeArtifacts.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32
77+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/compositeArtifacts.xml "
78+
aws s3 mv ./compositeContent.xml s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32
79+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/compositeContent.xml "
80+
aws s3 mv ./p2.index s3://${AWS_S3_BUCKET}/release/TOOLS/sts5/update/${dir} --checksum-algorithm CRC32
81+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5/update/${dir_name}/p2.index "
8282
fi
8383
done
8484
echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT

‎.github/workflows/aggregate-ls-extensions-update-site.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@ jobs:
3535
run: |
3636
echo "S3 Aggregate Update Sites Creation..."
3737
invalid_urls=""
38-
site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/${{ inputs.version }}"
38+
site_url="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/${{ inputs.version }}"
3939
${{ github.workspace }}/.github/scripts/generate-composite-site-files.sh ${{ steps.timestamp.outputs.date }} $site_url
4040
cat ./compositeArtifacts.xml
4141
cat ./compositeContent.xml
42-
aws s3 cp ./compositeArtifacts.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts4-language-server-integrations/ --checksum-algorithm CRC32
43-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/compositeArtifacts.xml "
44-
aws s3 cp ./compositeContent.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts4-language-server-integrations/ --checksum-algorithm CRC32
45-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/compositeContent.xml "
46-
aws s3 cp ./p2.index s3://$AWS_S3_BUCKET/release/TOOLS/sts4-language-server-integrations/ --checksum-algorithm CRC32
47-
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts4-language-server-integrations/p2.index"
42+
aws s3 cp ./compositeArtifacts.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32
43+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/compositeArtifacts.xml "
44+
aws s3 cp ./compositeContent.xml s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32
45+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/compositeContent.xml "
46+
aws s3 cp ./p2.index s3://$AWS_S3_BUCKET/release/TOOLS/sts5-language-server-integrations/ --checksum-algorithm CRC32
47+
invalid_urls+="${DOWNLOAD_URL_ROOT}/release/TOOLS/sts5-language-server-integrations/p2.index"
4848
echo "invalid_urls=$invalid_urls" >> $GITHUB_OUTPUT
4949
- uses: ./.github/actions/cloudflare-purge
5050
name: Invalidate URLs

‎.github/workflows/eclipse-ls-extensions-build.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ on:
2121
required: false
2222
default: false
2323
type: boolean
24-
sts4-language-servers-version:
25-
description: version of sts4 ls extensions
24+
sts-language-servers-version:
25+
description: version of sts ls extensions
2626
required: false
2727
type: string
2828
env:
@@ -76,16 +76,16 @@ jobs:
7676
gpg_passphrase: ${{ secrets.GPG_PASSPHRASE }}
7777
gpg_keyname: ${{ secrets.GPG_KEYID }}
7878
run: |
79-
sts4_ls_version=${{ inputs.sts4-language-servers-version }}
80-
sts4_ls_version_param=""
81-
if ! [[ -z ${sts4_ls_version} ]]; then
82-
sts4_ls_version_param="-Ddist.version=${sts4_ls_version}"
79+
sts_ls_version=${{ inputs.sts-language-servers-version }}
80+
sts_ls_version_param=""
81+
if ! [[ -z ${sts_ls_version} ]]; then
82+
sts_ls_version_param="-Ddist.version=${sts_ls_version}"
8383
fi
8484
cd eclipse-language-servers
8585
if command -v xvfb-run ; then
86-
xvfb-run ./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore
86+
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
8787
else
88-
./mvnw --batch-mode clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param -Pgitactions -Pgpg.sign -Dmaven.test.skip=true -Dhttpclient.retry-max=20 -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore
88+
./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
8989
fi
9090
- name: Upload P2 Repo to S3
9191
id: upload-p2
@@ -134,7 +134,7 @@ jobs:
134134
{
135135
\"header\": {
136136
\"title\": \"${build_type} Eclipse LS Extensions ${version}\",
137-
\"subtitle\": \"${{ inputs.sts4-language-servers-version }}\",
137+
\"subtitle\": \"${{ inputs.sts-language-servers-version }}\",
138138
\"imageUrl\": \"https://avatars.githubusercontent.com/u/317776?s=48&amp;v=4\",
139139
},
140140
\"sections\": [

‎.github/workflows/gh-hosted-eclipse-distro-build.yml‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ on:
1313
required: true
1414
default: 'snapshot'
1515
type: string
16-
sts4-language-servers-version:
16+
sts-language-servers-version:
1717
description: version of sts4 ls extensions
1818
required: false
1919
type: string
@@ -78,18 +78,18 @@ jobs:
7878
gpg_keyname: ${{ secrets.GPG_KEYID }}
7979
run: |
8080
java -version
81-
sts4_ls_version=${{ inputs.sts4-language-servers-version }}
82-
sts4_ls_version_param=""
83-
if ! [[ -z ${sts4_ls_version} ]]; then
84-
sts4_ls_version_param="-Dsts4-language-servers-version=${sts4_ls_version}"
81+
sts_ls_version=${{ inputs.sts-language-servers-version }}
82+
sts_ls_version_param=""
83+
if ! [[ -z ${sts_ls_version} ]]; then
84+
sts_ls_version_param="-Dsts-language-servers-version=${sts_ls_version}"
8585
fi
8686
p2_qualifier=${{ inputs.p2-qualifier }}
8787
p2_qualifier_param=""
8888
if ! [[ -z ${p2_qualifier} ]]; then
8989
p2_qualifier_param="-Dp2.qualifier=${p2_qualifier}"
9090
fi
9191
cd eclipse-distribution
92-
./mvnw --batch-mode -U clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign \
92+
./mvnw --batch-mode -U clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign \
9393
-Dmaven.repo.local=~/.m2/repository-signed -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dp2.replaceQualifier=true \
9494
-Dskip.eclipserun.proxies=false -Dtycho.equinox.resolver.uses=true \
9595
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
@@ -149,7 +149,7 @@ jobs:
149149
run: |
150150
echo "Uploading Win Zips and OSX tar.gz to S3 for signing..."
151151
id=${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
152-
aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/$id --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
152+
aws s3 cp ${{ github.workspace }}/eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target/products s3://$AWS_S3_BUCKET/sts-distro-ci-temp/$id --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
153153
outputs:
154154
id: ${{ inputs.eclipse_profile }}-${{ inputs.build_type }}-${{ github.run_id }}
155155
dist_path: ${{ steps.s3-paths.outputs.dist_path }}
@@ -175,7 +175,7 @@ jobs:
175175
rm -f spring-tools-for-eclipse*win*.zip*
176176
rm -f spring-tools-for-eclipse*win*.self-extracting.jar*
177177
ls
178-
aws s3 mv s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip*" --exclude "*/*" --no-progress
178+
aws s3 mv s3://$AWS_S3_BUCKET/sts-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*win*.zip*" --exclude "*/*" --no-progress
179179
- name: Sign EXE within zip files
180180
id: sign
181181
run: |
@@ -254,7 +254,7 @@ jobs:
254254
run: |
255255
rm -rf *macosx*
256256
ls
257-
aws s3 mv s3://$AWS_S3_BUCKET/sts4-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
257+
aws s3 mv s3://$AWS_S3_BUCKET/sts-distro-ci-temp/${{ needs.eclipse-distro-build.outputs.id }} . --recursive --exclude "*" --include "spring-tools-for-eclipse*macosx*.tar.gz" --exclude "*/*" --no-progress
258258
- name: Sign .app, Create and Sign DMG
259259
env:
260260
MACOS_CERTIFICATE_ID: ${{ secrets.MACOS_CERTIFICATE_ID }}
@@ -345,7 +345,7 @@ jobs:
345345
- name: Google Chat Notification
346346
run: |
347347
echo "P2 Update Site: ${DOWNLOAD_URL_ROOT}/${{ needs.eclipse-distro-build.outputs.p2_path }}"
348-
downloads_html="sts4-distro-downloads-${{ inputs.eclipse_profile }}.txt"
348+
downloads_html="sts-distro-downloads-${{ inputs.eclipse_profile }}.txt"
349349
rm -f ./downloads_html
350350
s3_url=s3://${AWS_S3_BUCKET}/${{ needs.eclipse-distro-build.outputs.dist_path }}
351351
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`
@@ -413,7 +413,7 @@ jobs:
413413
- name: Remove Temp Build Artifacts from S3
414414
id: cleanup-s3-temp-storage
415415
run: |
416-
aws s3 rm s3://$AWS_S3_BUCKET/sts4-distro-ci-temp --recursive --exclude "*" --include "${{ needs.eclipse-distro-build.outputs.id }}/*"
416+
aws s3 rm s3://$AWS_S3_BUCKET/sts-distro-ci-temp --recursive --exclude "*" --include "${{ needs.eclipse-distro-build.outputs.id }}/*"
417417
418418
notify-failure:
419419
needs: [ eclipse-distro-build, sign-win-distros, sign-osx-distros, cleanup, purge_cache ]

‎.github/workflows/snapshot-all.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name: Snapshot - Eclipse LS Extensions
22

33
concurrency:
4-
group: snapshot-all
4+
group: sts5-snapshot-all
55
cancel-in-progress: true
66

77
on:

‎.github/workflows/snapshot-vscode-extension.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,5 +64,5 @@ jobs:
6464
echo `${{ github.workspace }}/.github/scripts/gen-vscode-link-bullet.sh vscode-spring-cli "Spring CLI" $DOWNLOAD_URL_ROOT` >> $downloads_html
6565
echo '</ul>' >> $downloads_html
6666
cat ./$downloads_html
67-
aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/STS4/vscode-extensions/ --no-progress --checksum-algorithm CRC32
67+
aws s3 mv ./$downloads_html s3://$AWS_S3_BUCKET/snapshot/STS5/vscode-extensions/ --no-progress --checksum-algorithm CRC32
6868

‎.github/workflows/upload-nightly-downloads-page.yml‎

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- 'main'
88
paths:
99
- 'eclipse-distribution/common/html/nightly-distributions.html'
10+
- 'eclipse-distribution/common/html/nightly-distributions-4.html'
1011

1112
env:
1213
AWS_ACCESS_KEY_ID: ${{ secrets.CDN_S3_ACCESS_KEY }}
@@ -30,6 +31,21 @@ jobs:
3031
- name: Upload nightly-distributions.html
3132
run: |
3233
echo "Removing old nightly-distributions.html from s3..."
34+
35+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/nightly-distributions.html --debug --cli-connect-timeout 60
36+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/stylesheet.css --debug --cli-connect-timeout 60
37+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS5/jquery-2.0.3.min.js --debug --cli-connect-timeout 60
38+
3339
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --debug --cli-connect-timeout 60
40+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --debug --cli-connect-timeout 60
41+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/jquery-2.0.3.min.js --debug --cli-connect-timeout 60
42+
3443
echo "Uploading new nightly-distributions.html to s3..."
35-
aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --no-progress --checksum-algorithm CRC32
44+
45+
aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://$AWS_S3_BUCKET/snapshot/STS5/nightly-distributions.html --no-progress --checksum-algorithm CRC32
46+
aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/STS5/stylesheet.css --no-progress --checksum-algorithm CRC32
47+
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
48+
49+
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
50+
aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --no-progress --checksum-algorithm CRC32
51+
aws s3 cp ./eclipse-distribution/common/html/jquery-2.0.3.min.js s3://$AWS_S3_BUCKET/snapshot/STS4/jquery-2.0.3.min.js --no-progress --checksum-algorithm CRC32

0 commit comments

Comments
 (0)