Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GHA: Factor s3 upload out of poms for distros

Browse Source
This commit is contained in:
aboyko
2023-11-09 12:55:55 -05:00
parent bdc64fa218
commit c1794d7033
7 changed files with 28 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
.github/workflows/gh-hosted-eclipse-distro-build.yml vendored
View File

@@ -68,7 +68,18 @@ jobs:
p2_qualifier_param="-Dp2.qualifier=${p2_qualifier}"
fi
cd eclipse-distribution
./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign -Dsigning.skip=true -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Ds3service.https-only=true -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true -Dtycho.equinox.resolver.uses=true
./mvnw --batch-mode -U clean install -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} $sts4_ls_version_param $p2_qualifier_param -Pgitactions -Pgpg.sign -Dmaven.repo.local=~/.m2/repository-signed -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dp2.replaceQualifier=true -Dorg.eclipse.ecf.provider.filetransfer.httpclient.retrieve.readTimeout=1200000 -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.eclipserun.proxies=false -Dtycho.equinox.resolver.uses=true
- name: Upload P2 Repo Build Artifacts
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: |
cd eclipse-distribution/org.springframework.boot.ide.product.${{ inputs.eclipse_profile }}/target
dist_path=`cat s3-p2-repo-dist-path.txt`
echo "Dist path: ${dist_path}"
aws s3 rm s3://dist.springsource.com/${dist_path}/ --recursive --dryrun
aws s3 cp ./repository/ s3://dist.springsource.com/${dist_path}/ --recursive --acl public-read --dryrun
- name: Upload Linux Distro Build Artifacts
env:
AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}

2
eclipse-distribution/local-build.sh
View File

@@ -1,2 +1,2 @@
./mvnw clean install -Pe429 -Psnapshot -Dsigning.skip=true -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5 -Dskip.osx.signing=true -Dskip.win.signing=true -Dskip.osx.notarizing=true
./mvnw clean install -Pe429 -Psnapshot -Dhttpclient.retry-max=20 -Dmaven.test.skip=true -Declipse.p2.mirrors=false -Dtycho.localArtifacts=ignore -Dorg.eclipse.equinox.p2.transport.ecf.retry=5

18
eclipse-distribution/org.springframework.boot.ide.product.e428/pom.xml
View File

@@ -346,6 +346,7 @@
</goals>
</execution>
<!--
<execution>
<id>upload-nightly-downloads</id>
<phase>deploy</phase>
@@ -366,6 +367,7 @@
<goal>run</goal>
</goals>
</execution>
-->
<execution>
<id>generate-s3-upload-info</id>
@@ -391,9 +393,6 @@
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
@@ -415,6 +414,7 @@
</goals>
</execution>
<!--
<execution>
<id>upload-sts-repository</id>
<phase>deploy</phase>
@@ -459,19 +459,9 @@
<goal>run</goal>
</goals>
</execution>
-->
</executions>
<dependencies>
<dependency>
<groupId>org.springframework.build</groupId>
<artifactId>org.springframework.build.aws.ant</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.1</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>

20
eclipse-distribution/org.springframework.boot.ide.product.e429/pom.xml
View File

@@ -343,9 +343,6 @@
<configuration>
<skip>${skip.update-nightly-download-page}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
@@ -359,6 +356,7 @@
</goals>
</execution>
<!--
<execution>
<id>upload-nightly-downloads</id>
<phase>deploy</phase>
@@ -379,6 +377,7 @@
<goal>run</goal>
</goals>
</execution>
-->
<execution>
<id>generate-s3-upload-info</id>
@@ -404,9 +403,6 @@
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
@@ -428,6 +424,7 @@
</goals>
</execution>
<!--
<execution>
<id>upload-sts-repository</id>
<phase>deploy</phase>
@@ -472,19 +469,10 @@
<goal>run</goal>
</goals>
</execution>
-->
</executions>
<dependencies>
<dependency>
<groupId>org.springframework.build</groupId>
<artifactId>org.springframework.build.aws.ant</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.1</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>

20
eclipse-distribution/org.springframework.boot.ide.product.e430/pom.xml
View File

@@ -343,9 +343,6 @@
<configuration>
<skip>${skip.update-nightly-download-page}</skip>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<copy file="${project.build.directory}/../../common/html/nightly-generic-snippet-incl-apple-m1.html" tofile="${project.build.directory}/sts4-nightly-${dist.target.major}.html" overwrite="true"/>
<replace file="${project.build.directory}/sts4-nightly-${dist.target.major}.html" token="@QUALIFIER@" value="${unqualifiedVersion}.${p2.qualifier}" summary="yes" />
@@ -359,6 +356,7 @@
</goals>
</execution>
<!--
<execution>
<id>upload-nightly-downloads</id>
<phase>deploy</phase>
@@ -379,6 +377,7 @@
<goal>run</goal>
</goals>
</execution>
-->
<execution>
<id>generate-s3-upload-info</id>
@@ -404,9 +403,6 @@
<configuration>
<target>
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<property name="dist.full.version" value="${unqualifiedVersion}.${p2.qualifier}-${dist.target}" />
<property name="dist.file.name" value="${dist.project}-${dist.full.version}-updatesite.zip" />
@@ -428,6 +424,7 @@
</goals>
</execution>
<!--
<execution>
<id>upload-sts-repository</id>
<phase>deploy</phase>
@@ -472,19 +469,10 @@
<goal>run</goal>
</goals>
</execution>
-->
</executions>
<dependencies>
<dependency>
<groupId>org.springframework.build</groupId>
<artifactId>org.springframework.build.aws.ant</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.1</version>
</dependency>
<dependency>
<groupId>ant-contrib</groupId>
<artifactId>ant-contrib</artifactId>

121
eclipse-distribution/pom.xml
View File

@@ -65,39 +65,24 @@
<properties>
<p2.qualifier>${buildQualifier}-SNAPSHOT</p2.qualifier>
<p2.sign>false</p2.sign>
<p2.repository.name>Spring Tool Suite</p2.repository.name>
<!-- Signing -->
<signing.skip>true</signing.skip>
<signing.alias>vmware</signing.alias>
<!-- signing and notarizing (win exe signing + macOS app signing and notarizing-->
<skip.win.signing>true</skip.win.signing>
<skip.osx.signing>true</skip.osx.signing>
<skip.osx.notarizing>true</skip.osx.notarizing>
<dist.name>Spring Tool Suite 4</dist.name>
<dist.bucket>dist.springsource.com</dist.bucket>
<dist.key>TOOLS</dist.key>
<dist.accessKey>${env.bamboo_vault_tools_s3_accesskey_password}</dist.accessKey>
<dist.secretKey>${env.bamboo_vault_tools_s3_secretkey_password}</dist.secretKey>
<dist.project>sts4</dist.project>
<dist.pathpostfix>nightly</dist.pathpostfix>
<dist.path>${dist.type}/${dist.key}/${dist.project}/${dist.pathpostfix}</dist.path>
<sts4-language-servers-p2-repo>https://cdn.spring.io/spring-tools/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
<sts4-language-servers-p2-repo>https://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${sts4-language-servers-version}</sts4-language-servers-p2-repo>
<tycho-version>4.0.0</tycho-version>
<tycho-version>4.0.4</tycho-version>
<encoding>UTF-8</encoding>
<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
<vm-signing.ssh.user>signer</vm-signing.ssh.user>
<vm-signing.ssh.key>~bamboo/.ssh/id_rsa</vm-signing.ssh.key>
</properties>
<profiles>
@@ -150,33 +135,6 @@
</properties>
</profile>
<profile>
<id>vm-signing</id>
<build>
<plugins>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<executions>
<execution>
<id>VM JAR Sign</id>
<phase>package</phase>
<goals>
<goal>exec</goal>
</goals>
</execution>
</executions>
<configuration>
<arguments>
<argument>${project.build.directory}</argument>
</arguments>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<profile>
<id>e428</id>
<properties>
@@ -456,14 +414,6 @@
</profile>
<profile>
<id>bamboo-signing</id>
<properties>
<signing.store.password>${env.bamboo_vault_signing_passphrase}</signing.store.password>
<signing.key.password>${env.bamboo_vault_signing_passphrase}</signing.key.password>
</properties>
</profile>
<profile>
<id>bundle-tests</id>
<activation>
@@ -556,14 +506,6 @@
</pluginRepositories>
<build>
<extensions>
<!-- <extension>
<groupId>org.springframework.build.aws</groupId>
<artifactId>org.springframework.build.aws.maven</artifactId>
<version>3.1.0.RELEASE</version>
</extension> -->
</extensions>
<plugins>
<plugin>
@@ -586,14 +528,6 @@
</executions>
</plugin>
<plugin>
<artifactId>maven-deploy-plugin</artifactId>
<version>2.5</version>
<configuration>
<skip>true</skip>
</configuration>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
@@ -634,30 +568,6 @@
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jarsigner-plugin</artifactId>
<version>3.0.0</version>
<executions>
<execution>
<id>sign</id>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
<configuration>
<skip>${signing.skip}</skip>
<alias>${signing.alias}</alias>
<keystore>${signing.keystore}</keystore>
<storetype>${signing.storetype}</storetype>
<storepass>${signing.store.password}</storepass>
<keypass>${signing.key.password}</keypass>
<!-- <tsa>http://sha256timestamp.ws.symantec.com/sha256/timestamp</tsa> -->
<tsa>http://timestamp.digicert.com</tsa>
</configuration>
</plugin>
<plugin>
<groupId>io.github.git-commit-id</groupId>
<artifactId>git-commit-id-maven-plugin</artifactId>
@@ -784,36 +694,9 @@
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.ant</groupId>
<artifactId>ant-nodeps</artifactId>
<version>1.8.1</version>
</dependency>
<dependency>
<groupId>org.springframework.build</groupId>
<artifactId>org.springframework.build.aws.ant</artifactId>
<version>3.0.6.RELEASE</version>
</dependency>
<dependency>
<groupId>net.java.dev.jets3t</groupId>
<artifactId>jets3t</artifactId>
<version>0.8.1</version>
</dependency>
</dependencies>
</plugin>
<plugin>
<artifactId>exec-maven-plugin</artifactId>
<groupId>org.codehaus.mojo</groupId>
<configuration>
<executable>scripts/sign-jars.sh</executable>
<environmentVariables>
<SSH_USER>${vm-signing.ssh.user}</SSH_USER>
<SSH_KEY>${vm-signing.ssh.key}</SSH_KEY>
</environmentVariables>
</configuration>
</plugin>
</plugins>
</pluginManagement>
</build>

2
eclipse-language-servers/pom.xml
View File

@@ -303,7 +303,7 @@
<repository>
<id>p2-thirdparty-bundles</id>
<layout>p2</layout>
<url>https://cdn.spring.io/spring-tools/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version}</url>
<url>https://dist.springsource.com/release/TOOLS/third-party/misc-p2-repo/${misc.p2.repo.version}</url>
</repository>
</repositories>