diff --git a/.github/actions/sign_and_upload_package/action.yml b/.github/actions/sign_and_upload_package/action.yml deleted file mode 100644 index 03f8307..0000000 --- a/.github/actions/sign_and_upload_package/action.yml +++ /dev/null @@ -1,84 +0,0 @@ -name: Sign and Upload Package -description: 'Signs native modules with garasign' - -inputs: - aws_role_arn: - description: 'AWS role input for drivers-github-tools/gpg-sign@v2' - required: true - aws_region_name: - description: 'AWS region name input for drivers-github-tools/gpg-sign@v2' - required: true - aws_secret_id: - description: 'AWS secret id input for drivers-github-tools/gpg-sign@v2' - required: true - npm_package_name: - description: 'The name for the npm package this repository represents' - required: true - dry_run: - description: 'Should we upload files to the release?' - required: false - default: 'true' - artifact_directory: - description: The directory in which to output signatures. - required: true - -runs: - using: composite - steps: - - uses: actions/download-artifact@v4 - if: ${{ always() }} - - - run: npm pack - shell: bash - - - name: Make signatures directory - shell: bash - run: mkdir ${{ inputs.artifact_directory }} - - - name: Load version and package info - uses: baileympearson/drivers-github-tools/node/get_version_info@add-signing-env-action-for-node - with: - npm_package_name: ${{ inputs.npm_package_name }} - - - name: Set up drivers-github-tools - uses: mongodb-labs/drivers-github-tools/setup@v2 - with: - aws_region_name: ${{ inputs.aws_region_name }} - aws_role_arn: ${{ inputs.aws_role_arn }} - aws_secret_id: ${{ inputs.aws_secret_id }} - - - name: Determine what files to sign - if: ${{ always() }} - shell: bash - run: | - FILENAMES="build-*/*.tar.gz" - if [[ $FILENAMES =~ '*' ]]; then - FILENAMES=$(ls $FILENAMES | sed -e ':a' -e 'N' -e '$!ba' -e 's/\n/ /g') - fi - FILENAMES="$FILENAMES ${{ env.package_file }}" - echo "FILES FILES" - echo $FILENAMES - echo "FILES_TO_SIGN=${FILENAMES}" >> "$GITHUB_ENV" - - - - name: Create detached signature - uses: baileympearson/drivers-github-tools/gpg-sign@add-signing-env-action-for-node - with: - filenames: ${{ env.FILES_TO_SIGN }} - env: - RELEASE_ASSETS: ${{ inputs.artifact_directory }} - - - name: Copy the tarballs to the artifacts directory - shell: bash - run: for filename in ${{ env.FILES_TO_SIGN }}; do cp ${filename} artifacts/; done - - - name: Display structure of downloaded files - shell: bash - run: ls -la artifacts/ - - - name: "Upload release artifacts" - if: ${{ inputs.dry_run == false }} - run: gh release upload v${{ env.package_version }} artifacts/*.* - shell: bash - env: - GH_TOKEN: ${{ github.token }} \ No newline at end of file diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 98a4d5d..2ad1f02 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,8 +1,6 @@ on: push: - branches: [main] - pull_request: - branches: [main] + branches: ["6.1"] workflow_dispatch: {} permissions: @@ -10,7 +8,7 @@ permissions: pull-requests: write id-token: write -name: release-latest +name: release-6.1 jobs: release_please: @@ -21,7 +19,7 @@ jobs: - id: release uses: googleapis/release-please-action@v4 with: - target-branch: main + target-branch: 6.1 build: needs: [release_please] @@ -41,17 +39,17 @@ jobs: - uses: actions/checkout@v4 - name: Install Node and dependencies - uses: baileympearson/drivers-github-tools/node/setup@add-signing-env-action-for-node + uses: mongodb-labs/drivers-github-tools/node/setup@v2 with: ignore_install_scripts: true - name: Load version and package info - uses: baileympearson/drivers-github-tools/node/get_version_info@add-signing-env-action-for-node + uses: mongodb-labs/drivers-github-tools/node/get_version_info@v2 with: npm_package_name: mongodb-client-encryption - name: actions/compress_sign_and_upload - uses: baileympearson/drivers-github-tools/node/sign_node_package@add-signing-env-action-for-node + uses: mongodb-labs/drivers-github-tools/node/sign_node_package@v2 with: aws_role_arn: ${{ secrets.AWS_ROLE_ARN }} aws_region_name: us-east-1 @@ -77,7 +75,7 @@ jobs: with: release_version: ${{ env.package_version }} product_name: mongodb-client-encryption - sarif_report_target_ref: main + sarif_report_target_ref: 6.1 third_party_dependency_tool: n/a dist_filenames: artifacts/* token: ${{ github.token }} @@ -97,9 +95,9 @@ jobs: - uses: actions/checkout@v4 - name: Install Node and dependencies - uses: baileympearson/drivers-github-tools/node/setup@add-signing-env-action-for-node + uses: mongodb-labs/drivers-github-tools/node/setup@v2 - - run: npm publish --provenance --tag=latest + - run: npm publish --provenance --tag=6.1 if: ${{ needs.release_please.outputs.release_created }} env: NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}