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

GHA: correct osx signing script, stop osx signing in maven build

Browse Source
This commit is contained in:
aboyko
2023-07-19 18:48:33 -04:00
parent d2c12263fc
commit 6cef57c5d8
3 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/scripts/sign-notarize-osx-distro-file.sh vendored
View File

@@ -25,7 +25,7 @@ cd ${dir}/${destination_folder_name}
echo "Generating dmg-config.json..."
echo '{' >> dmg-config.json
echo ' "title": "Spring Tool Suite 4",' >> dmg-config.json
echo ' "icon": "/Users/aboyko/git/sts4/eclipse-distribution/org.springframework.boot.ide.branding/sts4.icns",' >> dmg-config.json
echo ' "icon": "'$icns'",' >> dmg-config.json
echo ' "contents": [' >> dmg-config.json
echo ' { "x": 192, "y": 100, "type": "file", "path": "./SpringToolSuite4.app" },' >> dmg-config.json
echo ' { "x": 448, "y": 100, "type": "link", "path": "/Applications" },' >> dmg-config.json

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

@@ -82,7 +82,7 @@ jobs:
run: |
cd eclipse-distribution
KEYCHAIN=$RUNNER_TEMP/app-signing.keychain-db
./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -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=false -Dskip.win.signing=true -Dskip.osx.notarizing=false -Dtycho.equinox.resolver.uses=true
./mvnw --batch-mode -U clean deploy -P${{ inputs.eclipse_profile }} -P${{ inputs.build_type }} -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
- name: Upload Build Artifacts for Signing
env:
AWS_ACCESS_KEY_ID: ${{ secrets.TOOLS_S3_ACCESS_KEY }}

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

@@ -529,10 +529,10 @@
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
<taskdef resource="org/springframework/build/aws/ant/antlib.xml" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA-256" fileext=".sha256" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA-256" fileext=".sha256" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="MD5" fileext=".md5" />
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="SHA-256" fileext=".sha256" />-->
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.x86_64.dmg" algorithm="MD5" fileext=".md5" />-->
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="SHA-256" fileext=".sha256" />-->
<!-- <checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-macosx.cocoa.aarch64.dmg" algorithm="MD5" fileext=".md5" />-->
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.x86_64.tar.gz" algorithm="MD5" fileext=".md5" />
<checksum file="${project.build.directory}/products/spring-tool-suite-4-${unqualifiedVersion}.${p2.qualifier}-${dist.target}-linux.gtk.aarch64.tar.gz" algorithm="SHA-256" fileext=".sha256" />
@@ -542,26 +542,21 @@
<delete bucketName="${dist.bucket}">
<fileset dir="${dist.path.product}">
<include name="spring-tool-suite-4*.tar.gz" />
<include name="spring-tool-suite-4*.tar.gz.md5" />
<include name="spring-tool-suite-4*.tar.gz.sha1" />
<include name="spring-tool-suite-4*.tar.gz.sha256" />
<include name="spring-tool-suite-4*.dmg" />
<include name="spring-tool-suite-4*.dmg.md5" />
<include name="spring-tool-suite-4*.dmg.sha1" />
<include name="spring-tool-suite-4*.dmg.sha256" />
<include name="spring-tool-suite-4*linux*.tar.gz*" />
<!-- <include name="spring-tool-suite-4*.dmg" />-->
<!-- <include name="spring-tool-suite-4*.dmg.md5" />-->
<!-- <include name="spring-tool-suite-4*.dmg.sha1" />-->
<!-- <include name="spring-tool-suite-4*.dmg.sha256" />-->
</fileset>
</delete>
<upload bucketName="${dist.bucket}" toDir="${dist.path.product}"
publicRead="true">
<fileset dir="${project.build.directory}/products">
<include name="spring-tool-suite-4*linux*.tar.gz" />
<include name="spring-tool-suite-4*linux*.tar.gz.md5" />
<include name="spring-tool-suite-4*linux*.tar.gz.sha256" />
<include name="spring-tool-suite-4*.dmg" />
<include name="spring-tool-suite-4*.dmg.md5" />
<include name="spring-tool-suite-4*.dmg.sha256" />
<include name="spring-tool-suite-4*linux*.tar.gz*" />
<!-- <include name="spring-tool-suite-4*.dmg" />-->
<!-- <include name="spring-tool-suite-4*.dmg.md5" />-->
<!-- <include name="spring-tool-suite-4*.dmg.sha256" />-->
</fileset>
</upload>