From 9e27beda10eabb6795ebbb96aa535160fa1d16ee Mon Sep 17 00:00:00 2001 From: jsonbailey Date: Thu, 22 May 2025 21:12:22 +0000 Subject: [PATCH] chore: Update signing key and keyring to be consistent --- .github/workflows/manual-publish.yml | 7 +++---- .github/workflows/release-please.yml | 15 ++++++++++----- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/workflows/manual-publish.yml b/.github/workflows/manual-publish.yml index 4242a01..9fa1f46 100644 --- a/.github/workflows/manual-publish.yml +++ b/.github/workflows/manual-publish.yml @@ -40,9 +40,8 @@ jobs: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME, /production/common/releasing/sonatype/password = SONATYPE_PASSWORD, - /production/common/releasing/android_code_signing/private_key_id = SIGNING_KEY_ID, - /production/common/releasing/android_code_signing/private_key_passphrase = SIGNING_KEY_PASSPHRASE' - s3_path_pairs: 'launchdarkly-releaser/android/code-signing-keyring.gpg = code-signing-keyring.gpg' + /production/common/releasing/java/keyId = SIGNING_KEY_ID, + s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg' - uses: ./.github/actions/full-release with: @@ -51,7 +50,7 @@ jobs: run_tests: ${{ inputs.run_tests }} prerelease: ${{ inputs.prerelease }} signing_key_id: ${{ env.SIGNING_KEY_ID }} - signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }} + signing_key_passphrase: '' code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg sonatype_username: ${{ env.SONATYPE_USER_NAME }} sonatype_password: ${{ env.SONATYPE_PASSWORD }} diff --git a/.github/workflows/release-please.yml b/.github/workflows/release-please.yml index 9e73130..d632969 100644 --- a/.github/workflows/release-please.yml +++ b/.github/workflows/release-please.yml @@ -40,6 +40,7 @@ jobs: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME, /production/common/releasing/sonatype/password = SONATYPE_PASSWORD' + /production/common/releasing/java/keyId = SIGNING_KEY_ID, s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg' - uses: ./.github/actions/full-release @@ -49,7 +50,7 @@ jobs: prerelease: false code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg signing_key_id: ${{ env.SIGNING_KEY_ID }} - signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }} + signing_key_passphrase: '' sonatype_username: ${{ env.SONATYPE_USER_NAME }} sonatype_password: ${{ env.SONATYPE_PASSWORD }} aws_role: ${{ vars.AWS_ROLE_ARN }} @@ -72,6 +73,7 @@ jobs: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME, /production/common/releasing/sonatype/password = SONATYPE_PASSWORD' + /production/common/releasing/java/keyId = SIGNING_KEY_ID, s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg' - uses: ./.github/actions/full-release @@ -81,7 +83,7 @@ jobs: prerelease: false code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg signing_key_id: ${{ env.SIGNING_KEY_ID }} - signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }} + signing_key_passphrase: '' sonatype_username: ${{ env.SONATYPE_USER_NAME }} sonatype_password: ${{ env.SONATYPE_PASSWORD }} aws_role: ${{ vars.AWS_ROLE_ARN }} @@ -104,6 +106,7 @@ jobs: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME, /production/common/releasing/sonatype/password = SONATYPE_PASSWORD' + /production/common/releasing/java/keyId = SIGNING_KEY_ID, s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg' - uses: ./.github/actions/full-release @@ -113,7 +116,7 @@ jobs: prerelease: false code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg signing_key_id: ${{ env.SIGNING_KEY_ID }} - signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }} + signing_key_passphrase: '' sonatype_username: ${{ env.SONATYPE_USER_NAME }} sonatype_password: ${{ env.SONATYPE_PASSWORD }} aws_role: ${{ vars.AWS_ROLE_ARN }} @@ -136,6 +139,7 @@ jobs: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME, /production/common/releasing/sonatype/password = SONATYPE_PASSWORD' + /production/common/releasing/java/keyId = SIGNING_KEY_ID, s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg' - uses: ./.github/actions/full-release @@ -145,7 +149,7 @@ jobs: prerelease: false code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg signing_key_id: ${{ env.SIGNING_KEY_ID }} - signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }} + signing_key_passphrase: '' sonatype_username: ${{ env.SONATYPE_USER_NAME }} sonatype_password: ${{ env.SONATYPE_PASSWORD }} aws_role: ${{ vars.AWS_ROLE_ARN }} @@ -169,6 +173,7 @@ jobs: aws_assume_role: ${{ vars.AWS_ROLE_ARN }} ssm_parameter_pairs: '/production/common/releasing/sonatype/username = SONATYPE_USER_NAME, /production/common/releasing/sonatype/password = SONATYPE_PASSWORD' + /production/common/releasing/java/keyId = SIGNING_KEY_ID, s3_path_pairs: 'launchdarkly-releaser/java/code-signing-keyring.gpg = code-signing-keyring.gpg' - uses: ./.github/actions/full-release @@ -178,7 +183,7 @@ jobs: prerelease: false code_signing_keyring: ${{ github.workspace }}/code-signing-keyring.gpg signing_key_id: ${{ env.SIGNING_KEY_ID }} - signing_key_passphrase: ${{ env.SIGNING_KEY_PASSPHRASE }} + signing_key_passphrase: '' sonatype_username: ${{ env.SONATYPE_USER_NAME }} sonatype_password: ${{ env.SONATYPE_PASSWORD }} aws_role: ${{ vars.AWS_ROLE_ARN }}