Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable pgp signing #435

Merged
merged 4 commits into from
May 31, 2024
Merged

Enable pgp signing #435

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7b3cda0
Enable pgp signing
akurtakov May 30, 2024
3e0ff02
Archive repository in Jenkins builds
akurtakov May 30, 2024
29e5a27
Disable jarsigning
akurtakov May 31, 2024
ee52d75
Upversion to 1.3.0
akurtakov May 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,14 @@ pipeline {
jdk 'temurin-jdk21-latest'
}
stages {
stage('Initialize PGP') {
steps {
withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING')]) {
sh 'gpg --batch --import "${KEYRING}"'
sh 'for fpr in $(gpg --list-keys --with-colons | awk -F: \'/fpr:/ {print $10}\' | sort -u); do echo -e "5\ny\n" | gpg --batch --command-fd 0 --expert --edit-key ${fpr} trust; done'
}
}
}
stage('Prepare') {
steps {
sh 'org.eclipse.corrosion/scripts/rustup-init.sh -y'
Expand All @@ -29,8 +37,10 @@ pipeline {
sh 'cargo --version'
sh 'rustup show'
sh 'rust-gdb --version'
withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
wrap([$class: 'Xvnc', useXauthority: true]) {
sh './mvnw -Dmaven.repo.local=$WORKSPACE/.m2 clean verify -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.showEclipseLog=true -Psign -Dsurefire.timeout=1800'
sh './mvnw -Dmaven.repo.local=$WORKSPACE/.m2 clean verify -Dmaven.test.error.ignore=true -Dmaven.test.failure.ignore=true -Dtycho.showEclipseLog=true -Psign -Dsurefire.timeout=1800 -Dgpg.passphrase="${KEYRING_PASSPHRASE}"'
}
}
sh 'rust-analyzer --version'
}
Expand All @@ -40,7 +50,7 @@ pipeline {
sh 'which rust-analyzer'
sh 'rust-analyzer --version'
junit '*/target/surefire-reports/TEST-*.xml'
archiveArtifacts artifacts: '*/target/work/data/.metadata/.log'
archiveArtifacts artifacts: '*/target/work/data/.metadata/.log,repository/target/repository/**'
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.corrosion.feature/feature.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="org.eclipse.corrosion.feature"
label="%name"
version="1.2.5.qualifier"
version="1.3.0.qualifier"
provider-name="Eclipse Corrosion"
license-feature="org.eclipse.license"
license-feature-version="0.0.0">
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.corrosion.product.branding/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-SymbolicName: org.eclipse.corrosion.product.branding;singleton:=true
Bundle-Version: 1.2.4.qualifier
Bundle-Version: 1.3.0.qualifier
Bundle-Vendor: Eclipse Corrosion
Require-Bundle: org.eclipse.platform,
org.eclipse.equinox.app,
Expand Down
4 changes: 2 additions & 2 deletions org.eclipse.corrosion.product.branding/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@
<parent>
<groupId>org.eclipse.corrosion</groupId>
<artifactId>parent</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.corrosion.product.branding</artifactId>
<packaging>eclipse-plugin</packaging>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>

</project>
2 changes: 1 addition & 1 deletion org.eclipse.corrosion.tests/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.corrosion.tests;singleton:=true
Bundle-Version: 1.0.0.qualifier
Bundle-Version: 1.3.0.qualifier
Bundle-Vendor: %Bundle-Vendor
Fragment-Host: org.eclipse.corrosion
Eclipse-BundleShape: dir
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.corrosion/META-INF/MANIFEST.MF
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: %Bundle-Name
Bundle-SymbolicName: org.eclipse.corrosion;singleton:=true
Bundle-Version: 1.2.5.qualifier
Bundle-Version: 1.3.0.qualifier
Automatic-Module-Name: org.eclipse.corrosion
Bundle-Activator: org.eclipse.corrosion.CorrosionPlugin
Bundle-Vendor: %Bundle-Vendor
Expand Down
48 changes: 1 addition & 47 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.eclipse.corrosion</groupId>
<artifactId>parent</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<properties>
<tycho-version>4.0.8</tycho-version>
Expand Down Expand Up @@ -158,44 +158,6 @@


<profiles>
<profile>
<id>sign</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-jarsigner-plugin</artifactId>
<version>1.4.3</version>
<executions>
<execution>
<id>sign</id>
<phase>package</phase>
<goals>
<goal>sign</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-p2-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<id>p2-metadata</id>
<phase>package</phase>
<goals>
<goal>p2-metadata</goal>
</goals>
</execution>
</executions>
<configuration>
<defaultP2Metadata>false</defaultP2Metadata>
</configuration>
</plugin>
</plugins>
</build>
</profile>
<!-- Automatic profile for Mac-specific settings -->
<profile>
<id>macos</id>
Expand All @@ -210,12 +172,4 @@
</profile>
</profiles>

<pluginRepositories>
<pluginRepository>
<id>cbi</id>
<url>https://repo.eclipse.org/content/groups/cbi</url>
<snapshots><enabled>true</enabled></snapshots>
</pluginRepository>
</pluginRepositories>

</project>
24 changes: 13 additions & 11 deletions repository/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,11 @@
<parent>
<groupId>org.eclipse.corrosion</groupId>
<artifactId>parent</artifactId>
<version>1.2.4-SNAPSHOT</version>
<version>1.3.0-SNAPSHOT</version>
</parent>

<artifactId>org.eclipse.corrosion.product</artifactId>
<packaging>eclipse-repository</packaging>
<version>1.2.5-SNAPSHOT</version>

<build>
<plugins>
Expand Down Expand Up @@ -105,29 +104,32 @@
</plugins>
</build>

<!--profiles>
<profiles>
<profile>
<id>packAndSign</id>
<id>sign</id>
<build>
<plugins>
<plugin>
<groupId>org.eclipse.cbi.maven.plugins</groupId>
<artifactId>eclipse-dmg-packager</artifactId>
<version>1.1.8-SNAPSHOT</version>
<groupId>org.eclipse.tycho</groupId>
<artifactId>tycho-gpg-plugin</artifactId>
<version>${tycho-version}</version>
<executions>
<execution>
<goals><goal>package-dmg</goal></goals>
<phase>package</phase>
<id>pgpsigner</id>
<goals>
<goal>sign-p2-artifacts</goal>
</goals>
<configuration>
<source>${project.build.directory}/products/eclipseide-rust-${parsedVersion.majorVersion}.${parsedVersion.minorVersion}.${parsedVersion.incrementalVersion}-macosx-cocoa-x86_64.tar.gz</source>
<keyname>19C6F458E5758349</keyname>
<skipIfJarsigned>false</skipIfJarsigned>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
</profile>
</profiles-->
</profiles>

<repositories>
<repository>
Expand Down
Loading