Skip to content

Commit 7c51cb6

Browse files
authored
chore: Update signing key and keyring to be consistent (#70)
1 parent cc71506 commit 7c51cb6

File tree

2 files changed

+13
-9
lines changed

2 files changed

+13
-9
lines changed

.github/workflows/manual-publish.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ jobs:
4040
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
4141
ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
4242
/production/common/releasing/sonatype/password = SONATYPE_PASSWORD,
43-
/production/common/releasing/android_code_signing/private_key_id = SIGNING_KEY_ID,
44-
/production/common/releasing/android_code_signing/private_key_passphrase = SIGNING_KEY_PASSPHRASE'
45-
s3_path_pairs: 'launchdarkly-releaser/android/code-signing-keyring.gpg = code-signing-keyring.gpg'
43+
/production/common/releasing/java/keyId = SIGNING_KEY_ID,
44+
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
4645

4746
- uses: ./.github/actions/full-release
4847
with:
@@ -51,7 +50,7 @@ jobs:
5150
run_tests: ${{ inputs.run_tests }}
5251
prerelease: ${{ inputs.prerelease }}
5352
signing_key_id: ${{ env.SIGNING_KEY_ID }}
54-
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
53+
signing_key_passphrase: ''
5554
code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg
5655
sonatype_username: ${{ env.SONATYPE_USER_NAME }}
5756
sonatype_password: ${{ env.SONATYPE_PASSWORD }}

.github/workflows/release-please.yml

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ jobs:
4040
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
4141
ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
4242
/production/common/releasing/sonatype/password = SONATYPE_PASSWORD'
43+
/production/common/releasing/java/keyId = SIGNING_KEY_ID,
4344
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
4445

4546
- uses: ./.github/actions/full-release
@@ -49,7 +50,7 @@ jobs:
4950
prerelease: false
5051
code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg
5152
signing_key_id: ${{ env.SIGNING_KEY_ID }}
52-
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
53+
signing_key_passphrase: ''
5354
sonatype_username: ${{ env.SONATYPE_USER_NAME }}
5455
sonatype_password: ${{ env.SONATYPE_PASSWORD }}
5556
aws_role: ${{ vars.AWS_ROLE_ARN }}
@@ -72,6 +73,7 @@ jobs:
7273
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
7374
ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
7475
/production/common/releasing/sonatype/password = SONATYPE_PASSWORD'
76+
/production/common/releasing/java/keyId = SIGNING_KEY_ID,
7577
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
7678

7779
- uses: ./.github/actions/full-release
@@ -81,7 +83,7 @@ jobs:
8183
prerelease: false
8284
code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg
8385
signing_key_id: ${{ env.SIGNING_KEY_ID }}
84-
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
86+
signing_key_passphrase: ''
8587
sonatype_username: ${{ env.SONATYPE_USER_NAME }}
8688
sonatype_password: ${{ env.SONATYPE_PASSWORD }}
8789
aws_role: ${{ vars.AWS_ROLE_ARN }}
@@ -104,6 +106,7 @@ jobs:
104106
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
105107
ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
106108
/production/common/releasing/sonatype/password = SONATYPE_PASSWORD'
109+
/production/common/releasing/java/keyId = SIGNING_KEY_ID,
107110
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
108111

109112
- uses: ./.github/actions/full-release
@@ -113,7 +116,7 @@ jobs:
113116
prerelease: false
114117
code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg
115118
signing_key_id: ${{ env.SIGNING_KEY_ID }}
116-
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
119+
signing_key_passphrase: ''
117120
sonatype_username: ${{ env.SONATYPE_USER_NAME }}
118121
sonatype_password: ${{ env.SONATYPE_PASSWORD }}
119122
aws_role: ${{ vars.AWS_ROLE_ARN }}
@@ -136,6 +139,7 @@ jobs:
136139
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
137140
ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
138141
/production/common/releasing/sonatype/password = SONATYPE_PASSWORD'
142+
/production/common/releasing/java/keyId = SIGNING_KEY_ID,
139143
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
140144

141145
- uses: ./.github/actions/full-release
@@ -145,7 +149,7 @@ jobs:
145149
prerelease: false
146150
code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg
147151
signing_key_id: ${{ env.SIGNING_KEY_ID }}
148-
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
152+
signing_key_passphrase: ''
149153
sonatype_username: ${{ env.SONATYPE_USER_NAME }}
150154
sonatype_password: ${{ env.SONATYPE_PASSWORD }}
151155
aws_role: ${{ vars.AWS_ROLE_ARN }}
@@ -169,6 +173,7 @@ jobs:
169173
aws_assume_role: ${{ vars.AWS_ROLE_ARN }}
170174
ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME,
171175
/production/common/releasing/sonatype/password = SONATYPE_PASSWORD'
176+
/production/common/releasing/java/keyId = SIGNING_KEY_ID,
172177
s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg'
173178

174179
- uses: ./.github/actions/full-release
@@ -178,7 +183,7 @@ jobs:
178183
prerelease: false
179184
code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg
180185
signing_key_id: ${{ env.SIGNING_KEY_ID }}
181-
signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }}
186+
signing_key_passphrase: ''
182187
sonatype_username: ${{ env.SONATYPE_USER_NAME }}
183188
sonatype_password: ${{ env.SONATYPE_PASSWORD }}
184189
aws_role: ${{ vars.AWS_ROLE_ARN }}

0 commit comments

Comments
 (0)