asdf

Author: baileympearson

.github/workflows/build.yml

@@ -7,7 +7,7 @@ on:
 name: Build
 
 jobs:
-  host_tests:
+  macos_and_windows:
     strategy:
       matrix:
         os: [macos-latest, windows-2019]
@@ -30,6 +30,14 @@ jobs:
         run: npm install --loglevel verbose && npm run prebuild
         shell: bash
 
+      # macOS arm64 builds are universal macOS binaries.  We copy the arm64 build
+      # into the location that prebuild expects for a x64 build so we can
+      # install on both architectures.
+      - name: copy universal macos binary to platform specific binaries
+        if: ${{ matrix.os == 'macos-latest' }}
+        shell: bash
+        run: bash etc/make-macos-x64-build.sh
+
       - id: upload
         name: Upload prebuild
         uses: actions/upload-artifact@v4
@@ -40,7 +48,7 @@ jobs:
           retention-days: 1
           compression-level: 0
 
-  container_tests_glibc:
+  glibc:
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -80,7 +88,7 @@ jobs:
           retention-days: 1
           compression-level: 0
 
-  container_tests_musl:
+  musl:
     runs-on: ubuntu-latest
     strategy:
       matrix:

.github/workflows/release.yml

@@ -61,7 +61,8 @@ jobs:
       - name: Copy sbom file to release assets
         shell: bash
         if: ${{ 'node-zstd' == '' }}
-        run: cp sbom.json ${{ env.S3_ASSETS }}/sbom.json
+        run: |
+          cp sbom.json ${{ env.S3_ASSETS }}/sbom.json
 
       - name: Augment SBOM and copy to release assets
         if: ${{ 'node-zstd' != '' }}

binding.gyp

@@ -34,7 +34,19 @@
               ]
             },
           }
-        ]
+        ],
+        ['ARCH=="arm64"', {
+          'xcode_settings': {
+            "OTHER_CFLAGS": [
+              "-arch x86_64",
+              "-arch arm64"
+            ],
+            "OTHER_LDFLAGS": [
+              "-arch x86_64",
+              "-arch arm64"
+            ]
+          }
+        }]
       ],
     'cflags!': [ '-fno-exceptions' ],
     'cflags_cc!': [ '-fno-exceptions' ],

etc/make-macos-x64-build.sh

@@ -0,0 +1,7 @@
+#! /bin/bash
+
+package_version=$(cat package.json | jq -r '.version')
+build_file=$(ls prebuilds/@mongodb-js)
+x64_file=$(echo $build_file | sed -e s/x64/arm64/g)
+echo $x64_file
+cp prebuilds/@mongodb-js/$build_file prebuilds/@mongodb-js/$x64_file

package-lock.json

@@ -19,7 +19,7 @@
   },
   "license": "Apache-2.0",
   "devDependencies": {
-    "@mongodb-js/zstd": "^1.2.0",
+    "@mongodb-js/zstd": "^2.0.0-alpha.0",
     "@typescript-eslint/eslint-plugin": "^8.11.0",
     "@wasm-fmt/clang-format": "^19.1.3",
     "chai": "^4.5.0",
@@ -55,4 +55,4 @@
     ]
   },
   "mongodb:zstd_version": "1.5.6"
-}
+}