Skip to content

Commit 56d37bd

Browse files
BoykoAlexBoykoAlex
committed
[GHA] Corrections
1 parent 97a3f8b commit 56d37bd

File tree

4 files changed

+17
-21
lines changed

4 files changed

+17
-21
lines changed

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,10 @@ jobs:
8787
run: |
8888
sts_ls_version=${{ inputs.sts-language-servers-version }}
8989
if [[ -z ${sts_ls_version} ]]; then
90-
sts_ls_version=nightly
90+
p2_path=${{ inputs.build_type }}/language-server-integrations
91+
else
92+
p2_path=${{ inputs.build_type }}/language-server-integrations/$sts_ls_version
9193
fi
92-
p2_path=${{ inputs.build_type }}/language-server-integrations/$sts_ls_version
9394
echo "p2_path=$p2_path" >> $GITHUB_OUTPUT
9495
echo "P2 path: ${p2_path}"
9596
aws s3 rm s3://$AWS_S3_BUCKET/${p2_path}/ --recursive

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,19 @@ jobs:
3232
run: |
3333
echo "Removing old nightly-distributions.html from s3..."
3434
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
35+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/nightly-distributions.html --debug --cli-connect-timeout 60
36+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/stylesheet.css --debug --cli-connect-timeout 60
37+
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/jquery-2.0.3.min.js --debug --cli-connect-timeout 60
3838
3939
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/nightly-distributions.html --debug --cli-connect-timeout 60
4040
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --debug --cli-connect-timeout 60
4141
aws s3 rm s3://$AWS_S3_BUCKET/snapshot/STS4/jquery-2.0.3.min.js --debug --cli-connect-timeout 60
4242
4343
echo "Uploading new nightly-distributions.html to s3..."
4444
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
45+
aws s3 cp ./eclipse-distribution/common/html/nightly-distributions.html s3://$AWS_S3_BUCKET/snapshot/nightly-distributions.html --no-progress --checksum-algorithm CRC32
46+
aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/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/jquery-2.0.3.min.js --no-progress --checksum-algorithm CRC32
4848
4949
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
5050
aws s3 cp ./eclipse-distribution/common/html/stylesheet.css s3://$AWS_S3_BUCKET/snapshot/STS4/stylesheet.css --no-progress --checksum-algorithm CRC32

‎eclipse-distribution/common/html/nightly-distributions.html

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<html>
33

44
<head>
5-
<title>Spring Tools 5 - Internal CI builds</title>
5+
<title>Spring Tools - Internal CI builds</title>
66
<link rel="shortcut icon" type="image/x-icon" href="https://www.springsource.org/sites/all/themes/s2org11/favicon.ico"/>
77
<link rel="stylesheet" href="stylesheet.css" type="text/css">
88
<meta content="text/html; charset=ISO-8859-1" http-equiv="content-type">
@@ -13,28 +13,28 @@
1313

1414
<div style="margin:40px;">
1515

16-
<h1>Spring Tools 5 - Internal CI builds</h1>
16+
<h1>Spring Tools - Internal CI builds</h1>
1717

1818
<h2>Eclipse p2 repositories</h2>
1919

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

2424
<p><b>STS5 Distributions:</b>
2525
<ul>
26-
<li>for Eclipse 2025-09 (4.37): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5/nightly/e4.37">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5/nightly/e4.37</a></li>
27-
<li>for Eclipse 2025-06 (4.36): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5/nightly/e4.36">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5/nightly/e4.36</a></li>
28-
<li>for Eclipse 2025-03 (4.35): <a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5/nightly/e4.35">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5/nightly/e4.35</a></li>
26+
<li>for Eclipse 2025-09 (4.37): <a href="https://cdn.spring.io/spring-tools/snapshot/update/e4.37">https://cdn.spring.io/spring-tools/snapshot/update/e4.37</a></li>
27+
<li>for Eclipse 2025-06 (4.36): <a href="https://cdn.spring.io/spring-tools/snapshot/update/e4.36">https://cdn.spring.io/spring-tools/snapshot/update/e4.36</a></li>
28+
<li>for Eclipse 2025-03 (4.35): <a href="https://cdn.spring.io/spring-tools/snapshot/update/e4.35">https://cdn.spring.io/spring-tools/snapshot/update/e4.35</a></li>
2929
</ul>
3030
</p>
3131

32-
<p><b>STS5 language server extensions</b> (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.)
32+
<p><b>Spring Tools language server extensions</b> (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.)
3333
</p>
3434

3535
<p>
3636
<ul>
37-
<li><a href="https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5-language-server-integrations/nightly">https://cdn.spring.io/spring-tools/snapshot/TOOLS/sts5-language-server-integrations/nightly</a></li>
37+
<li><a href="https://cdn.spring.io/spring-tools/snapshot/language-server-integrations">https://cdn.spring.io/spring-tools/snapshot/language-server-integrations</a></li>
3838
</ul>
3939
</p>
4040

‎eclipse-distribution/pom.xml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,6 @@
9494
<dist.path.repo>${dist.type}/TOOLS/sts5/nightly/${dist.target.major}</dist.path.repo>
9595
<dist.path.product>${dist.type}/STS5/nightly/dist/${dist.target.major}</dist.path.product>
9696
<skip.update-nightly-download-page>false</skip.update-nightly-download-page>
97-
98-
<sts-language-servers-version>nightly</sts-language-servers-version>
9997
</properties>
10098
</profile>
10199

@@ -106,8 +104,6 @@
106104
<dist.path.repo>${dist.type}/TOOLS/sts4/update/${unqualifiedVersion}.${p2.qualifier}/${dist.target.major}</dist.path.repo>
107105
<dist.path.product>${dist.type}/STS4/${unqualifiedVersion}.${p2.qualifier}/dist/${dist.target.major}</dist.path.product>
108106
<skip.update-nightly-download-page>true</skip.update-nightly-download-page>
109-
110-
<sts-language-servers-version>today</sts-language-servers-version> <!-- this should be overridden in the build with the concrete ls version to include-->
111107
</properties>
112108
</profile>
113109

@@ -117,7 +113,6 @@
117113
<dist.type>release</dist.type>
118114
<dist.path.repo>${dist.type}/TOOLS/sts4/update/${unqualifiedVersion}.${p2.qualifier}/${dist.target.major}</dist.path.repo>
119115
<dist.path.product>${dist.type}/STS4/${unqualifiedVersion}.${p2.qualifier}/dist/${dist.target.major}</dist.path.product>
120-
<sts-language-servers-version>today</sts-language-servers-version> <!-- this should be overridden in the build with the concrete ls version to include-->
121116
</properties>
122117
</profile>
123118

0 commit comments

Comments
 (0)