From 76431e7a26a44f1bd10b5346a74077fb8146580f Mon Sep 17 00:00:00 2001
From: Bailey Pearson <bailey.pearson@mongodb.com>
Date: Tue, 25 Jun 2024 15:39:49 -0600
Subject: [PATCH] add back full build matrix

---
 .github/workflows/build.yml   | 55 +++++++++++++++++------------------
 .github/workflows/release.yml |  9 +++---
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e7075c3..1abdba9 100644
--- 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
 
   
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5be2c51..224c5e2 100644
--- 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 }}