Try making a universal build for Mac

Github has effectively deprecated Intel Mac
so we need to find other solutions.

Author: greggman

.github/workflows/build.yml

@@ -33,12 +33,7 @@ jobs:
         - {
             name: "macOS Latest Clang",
             os: macos-latest,
-            artifact: darwin-arm64,
-          }
-        - {
-            name: "macOS Intel?",
-            os: macos-13,
-            artifact: darwin-x64,
+            artifact: darwin-universal,
           }
 
     steps:

build/build.js

@@ -38,6 +38,7 @@ async function compile() {
 async function createProject() {
   await processThenRestoreCWD(async () => {
     process.env.DEPOT_TOOLS_WIN_TOOLCHAIN = '0'
+    //process.env.DEPOT_TOOLS_UPDATE = '0'
     process.chdir(kDawnPath);
     fs.copyFileSync('scripts/standalone-with-node.gclient', '.gclient');
     await execute('gclient', ['metrics', '--opt-out']);
@@ -54,6 +55,7 @@ async function createProject() {
       '-DDAWN_BUILD_NODE_BINDINGS=1',
       '-DDAWN_USE_X11=OFF',
       `-DCMAKE_BUILD_TYPE=${kConfig}`,
+      ...addElemIf(isMac, '-DCMAKE_OSX_ARCHITECTURES="x86_64;arm64"'),
       ...addElemIf(isWin, '-DCMAKE_SYSTEM_VERSION=10.0.26100.0'),
       ...addElemIf(isMac, '-DCMAKE_OSX_SYSROOT=/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk'),
     ]);
@@ -71,7 +73,8 @@ async function copyResult(filepath, target) {
 async function main() {
   const compileOnly = process.argv[2] === '--compile-only';
   try {
-    const target = `${process.platform}-${process.arch}`;
+    const arch = isMac ? 'universal' : process.arch;
+    const target = `${process.platform}-${arch}`;
     console.log('building for:', target);
     if (!compileOnly) {
       await execute('git', ['submodule', 'update', '--init']);

index.js

@@ -2,8 +2,10 @@ import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { createRequire } from 'module';
 const require = createRequire(import.meta.url);
+export const isMac = process.platform === 'darwin';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
-const dawnNodePath = join(__dirname, 'dist', `${process.platform}-${process.arch}.dawn.node`);
+const arch = isMac ? 'universal' : process.arch;
+const dawnNodePath = join(__dirname, 'dist', `${process.platform}-${arch}.dawn.node`);
 const { create, globals } = require(dawnNodePath);
 export { create, globals }