More efforts for the x86 build

.github/workflows/package.yml

@@ -65,7 +65,7 @@ jobs:
       - uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
-          architecture: ${{ matrix.host }}
+          architecture: ${{ matrix.target }}
 
       - name: Install dependencies
         run: yarn install --network-timeout 300000
@@ -86,6 +86,7 @@ jobs:
         # github endpoints hang up quite a bit, add one retry.
         run: yarn run electron:ci || yarn run electron:ci
         env:
+          TARGET_ARCH: ${{ matrix.target }}
           GITHUB_TOKEN: ${{ github.token }}
           DEBUG: electron-builder
           APPLE_ID: ${{ secrets.APPLE_ID }}
@@ -96,6 +97,6 @@ jobs:
 
       - uses: actions/upload-artifact@v4
         with:
-          name: ${{ matrix.os }}-${{ matrix.host }}
+          name: ${{ matrix.os }}-${{ matrix.host }}-${{ matrix.target }}
           path: dist/grist-electron-*
           if-no-files-found: "error"

package.json

@@ -23,7 +23,7 @@
     "electron:preview": "electron core/_build/ext/app/electron/main.js",
     "electron:dir": "electron-builder build --linux --dir",
     "electron:linux": "electron-builder build --linux",
-    "electron:ci": "electron-builder build --publish always",
+    "electron:ci": "./scripts/ci.sh",
     "electron": "electron-builder build --publish never",
     "test": "cd core && rm -f junk.db && node _build/app/server/companion.js sqlite gristify junk.db && ls junk.db"
   },

scripts/ci.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+set -e
+
+case $TARGET_ARCH in
+  "x86")
+    ARCHFLAG="--ia32"
+    ;;
+  "x64")
+    ARCHFLAG="--x64"
+    ;;
+  "arm64")
+    ARCHFLAG="--arm64"
+    ;;
+  *)
+    echo "Target architecture $TARGET_ARCH not supported"
+    exit 1
+    ;;
+esac
+
+electron-builder build $ARCHFLAG --publish always