add back full build matrix

mongodb-js · Jun 25, 2024 · 76431e7 · 76431e7
1 parent a47f167
commit 76431e7
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 33 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -15,8 +15,7 @@ jobs:
  host_builds:
  strategy:
  matrix:
- os: [macos-latest]
- # os: [macos-latest, windows-2019]
+ os: [macos-latest, windows-2019]
  runs-on: ${{ matrix.os }}
  steps:
  - uses: actions/checkout@v4
@@ -39,35 +38,35 @@ jobs:
  retention-days: 1
  compression-level: 0
 
- # container_builds:
- #  outputs:
- #  artifact_id: ${{ steps.upload.outputs.artifact-id }}
- #  runs-on: ubuntu-latest
- #  strategy:
- #  matrix:
- #  linux_arch: [s390x, arm64, amd64]
- #  steps:
- #  - uses: actions/checkout@v4
+ container_builds:
+ outputs:
+ artifact_id: ${{ steps.upload.outputs.artifact-id }}
+ runs-on: ubuntu-latest
+ strategy:
+ matrix:
+ linux_arch: [s390x, arm64, amd64]
+ steps:
+ - uses: actions/checkout@v4
 
- #  - name: Set up QEMU
- #  uses: docker/setup-qemu-action@v3
+ - name: Set up QEMU
+ uses: docker/setup-qemu-action@v3
 
- #  - name: Set up Docker Buildx
- #  uses: docker/setup-buildx-action@v3
+ - name: Set up Docker Buildx
+ uses: docker/setup-buildx-action@v3
 
- #  - name: Run Buildx
- #  run: |
- #  docker buildx create --name builder --bootstrap --use
- #  docker buildx build --platform linux/${{ matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
+ - name: Run Buildx
+ run: |
+ docker buildx create --name builder --bootstrap --use
+ docker buildx build --platform linux/${{ matrix.linux_arch }} --output type=local,dest=./prebuilds,platform-split=false -f ./.github/docker/Dockerfile.glibc .
 
- #  - id: upload
- #  name: Upload prebuild
- #  uses: actions/upload-artifact@v4
- #  with:
- #  name: build-linux-${{ matrix.linux_arch }}
- #  path: prebuilds/
- #  if-no-files-found: 'error'
- #  retention-days: 1
- #  compression-level: 0
+ - id: upload
+ name: Upload prebuild
+ uses: actions/upload-artifact@v4
+ with:
+ name: build-linux-${{ matrix.linux_arch }}
+ path: prebuilds/
+ if-no-files-found: 'error'
+ retention-days: 1
+ compression-level: 0
 
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -54,7 +54,6 @@ jobs:
  aws_secret_id: ${{ secrets.AWS_SECRET_ID }}
  npm_package_name: 'mongodb-client-encryption'
  dry_run: ${{ needs.release_please.outputs.release_created == '' }}
- artifact_directory: artifacts
  sign_native: true
 
  - name: Copy sbom file to release assets
@@ -89,7 +88,7 @@ jobs:
  - name: Install Node and dependencies
  uses: baileympearson/drivers-github-tools/node/setup@add-signing-env-action-for-node
 
- # - run: npm publish --provenance --tag=latest
- #  if: ${{ needs.release_please.outputs.release_created }}
- #  env:
- #  NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+ - run: npm publish --provenance --tag=latest
+ if: ${{ needs.release_please.outputs.release_created }}
+ env:
+ NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}