Add universal builds on macOS (#767)

* Create `universal` builds on macOS

* try building separately

* use one build step per arch

* add arch to file name

* Revert "use one build step per arch"

This reverts commit 4d4b398.

* wip

* bump `@filecoin-station/core`

* use after-pack hook to rebuild core

* clean up

* `universal` seems to work!

* undo file name change

* clean up

* update `electron-builder`

* set `x64ArchFiles` (bacalhau arm64 is actually x64)

* fix bacalhau path

* Revert "fix bacalhau path"

This reverts commit f054187.

* Revert "set `x64ArchFiles` (bacalhau arm64 is actually x64)"

This reverts commit 4d974e8.

* disable `USE_HARD_LINKS`

.github/workflows/ci.yml

@@ -176,6 +176,7 @@ jobs:
           APPLEID: ${{ secrets.apple_id }}
           APPLEIDPASS: ${{ secrets.apple_id_pass }}
           APPLETEAMID: ${{ secrets.apple_team_id }}
+          USE_HARD_LINKS: false
 
       - name: Show dist/
         run: du -sh dist/ && ls -l dist/

build/after-pack.js

@@ -0,0 +1,46 @@
+'use strict'
+
+const { spawn } = require('node:child_process')
+const { platform } = require('node:os')
+const assert = require('node:assert')
+const { join } = require('node:path')
+const { once } = require('node:events')
+
+/** @typedef {import('app-builder-lib').AfterPackContext} AfterPackContext */
+
+/**
+ * @param {AfterPackContext} context
+ */
+exports.default = async function (context) {
+  if (platform() !== 'darwin') return
+  const arch = context.arch === 1
+    ? 'x64'
+    : context.arch === 3
+      ? 'arm64'
+      : context.arch === 4
+        ? 'universal'
+        : null
+  if (arch === 'universal') return
+  assert(arch, `Unknown architecture id: ${context.arch}`)
+  console.log(`Rebuild Station Core for arch=${arch}`)
+  const ps = spawn(
+    'node',
+    ['scripts/post-install.js'],
+    {
+      cwd: join(
+        context.appOutDir,
+        'Filecoin Station.app',
+        'Contents',
+        'Resources',
+        'core'
+      ),
+      env: {
+        ...process.env,
+        TARGET_ARCH: arch
+      }
+    }
+  )
+  ps.stdout.pipe(process.stdout)
+  ps.stderr.pipe(process.stderr)
+  await once(ps, 'exit')
+}

electron-builder.yml

@@ -16,6 +16,7 @@ extraResources:
   - 'core/**'
 
 beforePack: './build/before-pack.js'
+afterPack: './build/after-pack.js'
 afterSign: './build/notarize-macos.js'
 artifactName: '${productName}.${ext}'
 
@@ -28,9 +29,9 @@ mac:
   entitlementsInherit: 'build/entitlements.mac.plist'
   target:
     - target: dmg
-      arch: ['x64']
+      arch: ['universal']
     - target: zip
-      arch: ['x64']
+      arch: ['universal']
 
 
 dmg: