diff --git a/Jenkinsfile b/Jenkinsfile
index 9ffae4e..6fde239 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -15,14 +15,6 @@ 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'
@@ -37,9 +29,9 @@ pipeline {
sh 'cargo --version'
sh 'rustup show'
sh 'rust-gdb --version'
- withCredentials([string(credentialsId: 'gpg-passphrase', variable: 'KEYRING_PASSPHRASE')]) {
+ withCredentials([file(credentialsId: 'secret-subkeys.asc', variable: 'KEYRING'), 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 -Dgpg.passphrase="${KEYRING_PASSPHRASE}"'
+ 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 -Dtycho.pgp.signer.bc.secretKeys="${KEYRING}" -Dgpg.passphrase="${KEYRING_PASSPHRASE}"'
}
}
sh 'rust-analyzer --version'
diff --git a/repository/pom.xml b/repository/pom.xml
index cd3fc4d..2785c43 100644
--- a/repository/pom.xml
+++ b/repository/pom.xml
@@ -120,6 +120,7 @@
sign-p2-artifacts
+ bc
19C6F458E5758349
false