Skip to content

Commit 1e29d09

Browse files
authored
chore: update gpg credentials for signing Maven jars (#162)
1 parent daa3c04 commit 1e29d09

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

.kokoro/release.cfg

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,19 @@ before_action {
44
fetch_keystore {
55
keystore_resource {
66
keystore_config_id: 75669
7-
keyname: "functions-framework-java-release-bot-gpg-pubring"
7+
keyname: "functions-framework-java-release-bot-sonatype-password"
88
}
99
keystore_resource {
10-
keystore_config_id: 75669
11-
keyname: "functions-framework-java-release-bot-gpg-passphrase"
10+
keystore_config_id: 70247
11+
keyname: "maven-gpg-pubkeyring"
1212
}
1313
keystore_resource {
14-
keystore_config_id: 75669
15-
keyname: "functions-framework-java-release-bot-sonatype-password"
14+
keystore_config_id: 70247
15+
keyname: "maven-gpg-keyring"
16+
}
17+
keystore_resource {
18+
keystore_config_id: 70247
19+
keyname: "maven-gpg-passphrase"
1620
}
1721
}
1822
}

.kokoro/release.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,14 @@ set -e
77
setup_environment_secrets() {
88
export SONATYPE_USERNAME=functions-framework-release-bot
99
export SONATYPE_PASSWORD=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-sonatype-password)
10-
export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-passphrase)
10+
export GPG_PASSPHRASE=$(cat ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-passphrase)
1111

12-
# Add the keybox file to $GNUPGHOME to verify the GPG credentials.
12+
# Add the key ring files to $GNUPGHOME to verify the GPG credentials.
1313
export GNUPGHOME=/tmp/gpg
1414
mkdir $GNUPGHOME
15-
mv ${KOKORO_KEYSTORE_DIR}/75669_functions-framework-java-release-bot-gpg-pubring $GNUPGHOME/pubring.kbx
15+
mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-pubkeyring $GNUPGHOME/pubring.gpg
16+
mv ${KOKORO_KEYSTORE_DIR}/70247_maven-gpg-keyring $GNUPGHOME/secring.gpg
17+
gpg -k
1618
}
1719

1820
create_settings_xml_file() {
@@ -63,6 +65,6 @@ echo "JAVA_HOME=$JAVA_HOME"
6365
mvn clean deploy -B \
6466
-P sonatype-oss-release \
6567
--settings=../settings.xml \
66-
-Dgpg.executable=gpg2 \
68+
-Dgpg.executable=gpg \
6769
-Dgpg.passphrase=${GPG_PASSPHRASE} \
6870
-Dgpg.homedir=${GNUPGHOME}

0 commit comments

Comments
 (0)