Skip to content

Commit 5bf9c8a

Browse files
baileympearsonbaileympearson
committed
resolve conflicts
1 parent 12ec664 commit 5bf9c8a

File tree

5 files changed

+249
-143
lines changed

5 files changed

+249
-143
lines changed

‎.github/actions/setup/action.yml

-15
This file was deleted.

‎.github/actions/sign_and_upload_package/action.yml

-71
This file was deleted.

‎.github/workflows/build.yml

+30-57
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
on:
2-
push:
3-
branches: [main]
42
pull_request:
53
branches: [main]
64
workflow_dispatch: {}
5+
workflow_call: {}
76

87
name: Build and Test
98

@@ -16,7 +15,8 @@ jobs:
1615
host_builds:
1716
strategy:
1817
matrix:
19-
os: [macos-latest, windows-2019]
18+
# os: [macos-latest, windows-2019]
19+
os: [macos-latest]
2020
runs-on: ${{ matrix.os }}
2121
steps:
2222
- uses: actions/checkout@v4
@@ -39,62 +39,35 @@ jobs:
3939
retention-days: 1
4040
compression-level: 0
4141

42-
container_builds:
43-
outputs:
44-
artifact_id: ${{ steps.upload.outputs.artifact-id }}
45-
runs-on: ubuntu-latest
46-
strategy:
47-
matrix:
48-
linux_arch: [s390x, arm64, amd64]
49-
steps:
50-
- uses: actions/checkout@v4
42+
# container_builds:
43+
# outputs:
44+
# artifact_id: ${{ steps.upload.outputs.artifact-id }}
45+
# runs-on: ubuntu-latest
46+
# strategy:
47+
# matrix:
48+
# linux_arch: [s390x, arm64, amd64]
49+
# steps:
50+
# - uses: actions/checkout@v4
5151

52-
- name: Set up QEMU
53-
uses: docker/setup-qemu-action@v3
52+
# - name: Set up QEMU
53+
# uses: docker/setup-qemu-action@v3
5454

55-
- name: Set up Docker Buildx
56-
uses: docker/setup-buildx-action@v3
55+
# - name: Set up Docker Buildx
56+
# uses: docker/setup-buildx-action@v3
5757

58-
- name: Run Buildx
59-
run: |
60-
docker buildx create --name builder --bootstrap --use
61-
docker buildx build --platform linux/${{ matrix.linux_arch }} --build-arg NODE_ARCH=${{ matrix.linux_arch == 'amd64' && 'x64' || matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
62-
63-
- id: upload
64-
name: Upload prebuild
65-
uses: actions/upload-artifact@v4
66-
with:
67-
name: build-linux-${{ matrix.linux_arch }}
68-
path: prebuilds/
69-
if-no-files-found: 'error'
70-
retention-days: 1
71-
compression-level: 0
58+
# - name: Run Buildx
59+
# run: |
60+
# docker buildx create --name builder --bootstrap --use
61+
# docker buildx build --platform linux/${{ matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
7262

73-
release_please:
74-
needs: [host_builds, container_builds]
75-
runs-on: ubuntu-latest
76-
outputs:
77-
release_created: ${{ steps.release.outputs.release_created }}
78-
steps:
79-
- id: release
80-
uses: googleapis/release-please-action@v4
63+
# - id: upload
64+
# name: Upload prebuild
65+
# uses: actions/upload-artifact@v4
66+
# with:
67+
# name: build-linux-${{ matrix.linux_arch }}
68+
# path: prebuilds/
69+
# if-no-files-found: 'error'
70+
# retention-days: 1
71+
# compression-level: 0
8172

82-
sign_and_upload:
83-
needs: [release_please]
84-
if: ${{ needs.release_please.outputs.release_created }}
85-
runs-on: ubuntu-latest
86-
environment: release
87-
steps:
88-
- uses: actions/checkout@v4
89-
- name: actions/setup
90-
uses: ./.github/actions/setup
91-
- name: actions/sign_and_upload_package
92-
uses: ./.github/actions/sign_and_upload_package
93-
with:
94-
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
95-
aws_region_name: 'us-east-1'
96-
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
97-
npm_package_name: 'mongodb-client-encryption'
98-
- run: npm publish --provenance --tag=alpha
99-
env:
100-
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
73+

‎.github/workflows/release.yml

+105
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,105 @@
1+
on:
2+
push:
3+
branches: ["6.1"]
4+
pull_request:
5+
branches: ["main"]
6+
workflow_dispatch: {}
7+
8+
permissions:
9+
contents: write
10+
pull-requests: write
11+
id-token: write
12+
13+
name: release-6.1
14+
15+
jobs:
16+
release_please:
17+
runs-on: ubuntu-latest
18+
outputs:
19+
release_created: ${{ steps.release.outputs.release_created }}
20+
steps:
21+
- id: release
22+
uses: googleapis/release-please-action@v4
23+
with:
24+
target-branch: 6.1
25+
26+
build:
27+
needs: [release_please]
28+
name: "Perform any build or bundling steps, as necessary."
29+
uses: ./.github/workflows/build.yml
30+
31+
ssdlc:
32+
needs: [release_please, build]
33+
permissions:
34+
# required for all workflows
35+
security-events: write
36+
id-token: write
37+
contents: write
38+
environment: release
39+
runs-on: ubuntu-latest
40+
steps:
41+
- uses: actions/checkout@v4
42+
43+
- name: Install Node and dependencies
44+
uses: mongodb-labs/drivers-github-tools/node/setup@v2
45+
with:
46+
ignore_install_scripts: true
47+
48+
- name: Load version and package info
49+
uses: mongodb-labs/drivers-github-tools/node/get_version_info@v2
50+
with:
51+
npm_package_name: mongodb-client-encryption
52+
53+
- name: actions/compress_sign_and_upload
54+
uses: mongodb-labs/drivers-github-tools/node/sign_node_package@v2
55+
with:
56+
aws_role_arn: ${{ secrets.AWS_ROLE_ARN }}
57+
aws_region_name: us-east-1
58+
aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
59+
npm_package_name: mongodb-client-encryption
60+
dry_run: ${{ needs.release_please.outputs.release_created == '' }}
61+
62+
- name: Copy sbom file to release assets
63+
shell: bash
64+
if: ${{ 'mongodb-client-encryption-6.1' == '' }}
65+
run: cp sbom.json ${{ env.S3_ASSETS }}/sbom.json
66+
67+
# only used for mongodb-client-encryption
68+
- name: Augment SBOM and copy to release assets
69+
if: ${{ 'mongodb-client-encryption-6.1' != '' }}
70+
uses: mongodb-labs/drivers-github-tools/sbom@v2
71+
with:
72+
silk_asset_group: 'mongodb-client-encryption-6.1'
73+
sbom_file_name: sbom.json
74+
75+
- name: Generate authorized pub report
76+
uses: mongodb-labs/drivers-github-tools/full-report@v2
77+
with:
78+
release_version: ${{ env.package_version }}
79+
product_name: mongodb-client-encryption
80+
sarif_report_target_ref: 6.1
81+
third_party_dependency_tool: n/a
82+
dist_filenames: artifacts/*
83+
token: ${{ github.token }}
84+
sbom_file_name: sbom.json
85+
86+
- uses: mongodb-labs/drivers-github-tools/upload-s3-assets@v2
87+
with:
88+
version: ${{ env.package_version }}
89+
product_name: mongodb-client-encryption
90+
dry_run: ${{ needs.release_please.outputs.release_created == '' }}
91+
92+
publish:
93+
needs: [release_please, ssdlc, build]
94+
environment: release
95+
runs-on: ubuntu-latest
96+
steps:
97+
- uses: actions/checkout@v4
98+
99+
- name: Install Node and dependencies
100+
uses: mongodb-labs/drivers-github-tools/node/setup@v2
101+
102+
- run: npm publish --provenance --tag=6.1
103+
if: ${{ needs.release_please.outputs.release_created }}
104+
env:
105+
NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

0 commit comments

Comments
 (0)