Skip to content

Commit 52b4faa

Browse files
committed
Cleanup jar and exe signing
1 parent 8c9692f commit 52b4faa

File tree

7 files changed

+6
-7
lines changed
  • eclipse-distribution
    • org.springframework.boot.ide.product.e425
    • org.springframework.boot.ide.product.e426
    • org.springframework.boot.ide.product.e427
    • org.springframework.boot.ide.product.e428
    • scripts
  • eclipse-language-servers
  • headless-services/jdt-ls-extension

7 files changed

+6
-7
lines changed

eclipse-distribution/org.springframework.boot.ide.product.e425/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@
350350

351351
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
352352

353-
<exec executable="${project.parent.basedir}/scripts/sign-exe.sh" failonerror="true">
353+
<exec executable="${project.basedir}/../scripts/sign-exe.sh" failonerror="true">
354354
<env key="SSH_USER" value="${vm-signing.ssh.user}" />
355355
<env key="SSH_KEY" value="${vm-signing.ssh.key}" />
356356
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>

eclipse-distribution/org.springframework.boot.ide.product.e426/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362

363363
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
364364

365-
<exec executable="${project.parent.basedir}/scripts/sign-exe.sh" failonerror="true">
365+
<exec executable="${project.basedir}/../scripts/sign-exe.sh" failonerror="true">
366366
<env key="SSH_USER" value="${vm-signing.ssh.user}" />
367367
<env key="SSH_KEY" value="${vm-signing.ssh.key}" />
368368
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>

eclipse-distribution/org.springframework.boot.ide.product.e427/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362

363363
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
364364

365-
<exec executable="${project.parent.basedir}/scripts/sign-exe.sh" failonerror="true">
365+
<exec executable="${project.basedir}/../scripts/sign-exe.sh" failonerror="true">
366366
<env key="SSH_USER" value="${vm-signing.ssh.user}" />
367367
<env key="SSH_KEY" value="${vm-signing.ssh.key}" />
368368
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362

363363
<taskdef resource="net/sf/antcontrib/antcontrib.properties" />
364364

365-
<exec executable="${project.build.directory}/../../scripts/sign-exe.sh" failonerror="true">
365+
<exec executable="${project.basedir}/../scripts/sign-exe.sh" failonerror="true">
366366
<env key="SSH_USER" value="${vm-signing.ssh.user}" />
367367
<env key="SSH_KEY" value="${vm-signing.ssh.key}" />
368368
<arg value="${project.build.directory}/products/org.springframework.boot.ide.branding.sts4/win32/win32/x86_64/sts-${unqualifiedVersion}.${p2.qualifier}/SpringToolSuite4.exe"/>

eclipse-distribution/scripts/sign-exe.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ out_file=$2
44

55
in_filename="$(basename -- $in_file)"
66
echo "Copying $in_filename to remote machine..."
7-
echo "Input file: $in_file"
87
scp -i $SSH_KEY $in_file $SSH_USER@vm-tools.spring.vmware.com:/opt/bamboo
98
echo "Signing $in_filename..."
109
ssh -i $SSH_KEY $SSH_USER@vm-tools.spring.vmware.com -- /build/apps/signing/signserver/signc -v --input=/opt/bamboo/$in_filename --keyid=authenticode_SHA2 --signmethod="winddk-8.1" --output=/opt/bamboo/$in_filename --hash sha256

eclipse-language-servers/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@
102102
<gpg.passphrase>${env.bamboo_vault_tools_signing_gpg_secret_passphrase}</gpg.passphrase>
103103

104104
<vm-signing.ssh.user>signer</vm-signing.ssh.user>
105-
<vm-signing.ssh.key>/home/bamboo/.ssh/id_rsa</vm-signing.ssh.key>
105+
<vm-signing.ssh.key>~bamboo/.ssh/id_rsa</vm-signing.ssh.key>
106106
</properties>
107107

108108
<profiles>

headless-services/jdt-ls-extension/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<misc.p2.repo.version>3.9.4.202211021051</misc.p2.repo.version>
5454

5555
<vm-signing.ssh.user>signer</vm-signing.ssh.user>
56-
<vm-signing.ssh.key>/home/bamboo/.ssh/id_rsa</vm-signing.ssh.key>
56+
<vm-signing.ssh.key>~bamboo/.ssh/id_rsa</vm-signing.ssh.key>
5757
</properties>
5858

5959
<profiles>

0 commit comments

Comments
 (0)