Skip to content

Commit 312d64c

Browse files
aditi-khare-mongoDBbaileympearson
authored andcommitted
chore: upgrade release signing to drivers-github-tools v2 (#696)
1 parent 9e2084f commit 312d64c

File tree

3 files changed

+44
-28
lines changed

3 files changed

+44
-28
lines changed

.github/actions/compress_sign_and_upload/action.yml

Lines changed: 29 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@ name: Compress and Sign
22
description: 'Compresses package and signs with garasign'
33

44
inputs:
5-
garasign_username:
6-
description: 'Garasign username input for drivers-github-tools/garasign/gpg-sign'
5+
aws_role_arn:
6+
description: 'AWS role input for drivers-github-tools/gpg-sign@v2'
77
required: true
8-
garasign_password:
9-
description: 'Garasign password input for drivers-github-tools/garasign/gpg-sign'
8+
aws_region_name:
9+
description: 'AWS region name input for drivers-github-tools/gpg-sign@v2'
1010
required: true
11-
artifactory_username:
12-
description: 'Artifactory username input for drivers-github-tools/garasign/gpg-sign'
11+
aws_secret_id:
12+
description: 'AWS secret id input for drivers-github-tools/gpg-sign@v2'
1313
required: true
14-
artifactory_password:
15-
description: 'Artifactory password input for drivers-github-tools/garasign/gpg-sign'
14+
npm_package_name:
15+
description: 'The name for the npm package this repository represents'
1616
required: true
17+
sign_SBOMs:
18+
description: 'If provided, this script will create SBOM signatures'
19+
required: false
1720

1821
runs:
1922
using: composite
@@ -27,18 +30,28 @@ runs:
2730
run: |
2831
package_version=$(jq --raw-output '.version' package.json)
2932
echo "package_version=${package_version}" >> "$GITHUB_OUTPUT"
30-
echo "package_file=bson-${package_version}.tgz" >> "$GITHUB_OUTPUT"
33+
echo "package_file=${{ inputs.npm_package_name }}-${package_version}.tgz" >> "$GITHUB_OUTPUT"
34+
35+
- name: Set up drivers-github-tools
36+
uses: mongodb-labs/drivers-github-tools/setup@v2
37+
with:
38+
aws_region_name: ${{ inputs.aws_region_name }}
39+
aws_role_arn: ${{ inputs.aws_role_arn }}
40+
aws_secret_id: ${{ inputs.aws_secret_id }}
41+
3142
- name: Create detached signature
32-
uses: mongodb-labs/drivers-github-tools/garasign/gpg-sign@v1
33-
with:
43+
uses: mongodb-labs/drivers-github-tools/gpg-sign@v2
44+
with:
3445
filenames: ${{ steps.get_vars.outputs.package_file }}
35-
garasign_username: ${{ inputs.garasign_username }}
36-
garasign_password: ${{ inputs.garasign_password }}
37-
artifactory_username: ${{ inputs.artifactory_username }}
38-
artifactory_password: ${{ inputs.artifactory_password }}
46+
env:
47+
RELEASE_ASSETS: ${{ steps.get_vars.outputs.package_file }}.temp.sig
48+
49+
- name: Name release asset correctly
50+
run: mv ${{ steps.get_vars.outputs.package_file }}.temp.sig ${{ steps.get_vars.outputs.package_file }}.sig
51+
shell: bash
3952

4053
- name: "Upload release artifacts"
4154
run: gh release upload v${{ steps.get_vars.outputs.package_version }} ${{ steps.get_vars.outputs.package_file }}.sig
4255
shell: bash
4356
env:
44-
GH_TOKEN: ${{ github.token }}
57+
GH_TOKEN: ${{ github.token }}

.github/workflows/release-5.x.yml

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,24 +17,26 @@ jobs:
1717
release_created: ${{ steps.release.outputs.release_created }}
1818
steps:
1919
- id: release
20-
uses: google-github-actions/release-please-action@v4
20+
uses: googleapis/release-please-action@v4
2121
with:
2222
target-branch: 5.x
2323

24-
compress-sign-and-upload:
24+
compress_sign_and_upload:
2525
needs: [release_please]
26+
if: ${{ needs.release_please.outputs.release_created }}
27+
environment: release
2628
runs-on: ubuntu-latest
2729
steps:
2830
- uses: actions/checkout@v4
2931
- name: actions/setup
3032
uses: ./.github/actions/setup
3133
- name: actions/compress_sign_and_upload
3234
uses: ./.github/actions/compress_sign_and_upload
33-
with:
34-
garasign_username: ${{ secrets.GRS_CONFIG_USER1_USERNAME }}
35-
garasign_password: ${{ secrets.GRS_CONFIG_USER1_PASSWORD }}
36-
artifactory_username: ${{ secrets.ARTIFACTORY_USER }}
37-
artifactory_password: ${{ secrets.ARTIFACTORY_PASSWORD }}
35+
with:
36+
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
37+
aws_region_name: 'us-east-1'
38+
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
39+
npm_package_name: 'bson'
3840
- run: npm publish --provenance --tag=5x
3941
env:
4042
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/release.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@ jobs:
1818
steps:
1919
- id: release
2020
uses: googleapis/release-please-action@v4
21-
21+
2222
compress_sign_and_upload:
2323
needs: [release_please]
2424
if: ${{ needs.release_please.outputs.release_created }}
25+
environment: release
2526
runs-on: ubuntu-latest
2627
steps:
2728
- uses: actions/checkout@v4
@@ -30,10 +31,10 @@ jobs:
3031
- name: actions/compress_sign_and_upload
3132
uses: ./.github/actions/compress_sign_and_upload
3233
with:
33-
garasign_username: ${{ secrets.GRS_CONFIG_USER1_USERNAME }}
34-
garasign_password: ${{ secrets.GRS_CONFIG_USER1_PASSWORD }}
35-
artifactory_username: ${{ secrets.ARTIFACTORY_USER }}
36-
artifactory_password: ${{ secrets.ARTIFACTORY_PASSWORD }}
34+
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
35+
aws_region_name: 'us-east-1'
36+
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
37+
npm_package_name: 'bson'
3738
- run: npm publish --provenance
3839
env:
3940
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

0 commit comments

Comments
 (0)