File tree Expand file tree Collapse file tree 2 files changed +7
-35
lines changed
eclipse-language-servers/org.springframework.tooling.ls.integration.repository Expand file tree Collapse file tree 2 files changed +7
-35
lines changed Original file line number Diff line number Diff line change @@ -76,21 +76,20 @@ jobs:
7676 gpg_passphrase : ${{ secrets.GPG_PASSPHRASE }}
7777 gpg_keyname : ${{ secrets.GPG_KEYID }}
7878 run : |
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}"
83- fi
8479 cd eclipse-language-servers
8580 if command -v xvfb-run ; then
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
81+ 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
8782 else
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
83+ ./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
8984 fi
9085 - name : Upload P2 Repo to S3
9186 id : upload-p2
9287 run : |
93- p2_path=`cat ${{ github.workspace }}/eclipse-language-servers/org.springframework.tooling.ls.integration.repository/target/s3-p2-repo-dist-path.txt`
88+ sts_ls_version=${{ inputs.sts-language-servers-version }}
89+ if [[ -z ${sts_ls_version} ]]; then
90+ sts_ls_version=nightly
91+ fi
92+ p2_path=${{ inputs.build_type }}/language-server-integrations/
9493 echo "p2_path=$p2_path" >> $GITHUB_OUTPUT
9594 echo "P2 path: ${p2_path}"
9695 aws s3 rm s3://$AWS_S3_BUCKET/${p2_path}/ --recursive
Original file line number Diff line number Diff line change 1515 <dist .project>sts5-language-server-integrations</dist .project>
1616 </properties >
1717
18- <build >
19- <plugins >
20-
21- <plugin >
22- <groupId >org.apache.maven.plugins</groupId >
23- <artifactId >maven-antrun-plugin</artifactId >
24- <version >1.7</version >
25- <executions >
26- <execution >
27- <id >generate-s3-upload-info</id >
28- <phase >verify</phase >
29- <configuration >
30- <target >
31- <echo file =" ${project.build.directory}/s3-p2-repo-dist-path.txt" >
32- ${dist.path}
33- </echo >
34- </target >
35- </configuration >
36- <goals >
37- <goal >run</goal >
38- </goals >
39- </execution >
40- </executions >
41- </plugin >
42- </plugins >
43- </build >
44-
4518 <profiles >
4619 <profile >
4720 <id >gpg.sign</id >
You can’t perform that action at this time.
0 commit comments