ci: enhance macOS build workflows with architecture-specific commands

Author: antonreshetov

.github/workflows/build-sponsored.yml

@@ -10,13 +10,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-latest
-            platform: mac
-            arch: universal
-          - os: macos-latest
+          - os: macos-15-intel
             platform: mac
             arch: x64
-          - os: macos-latest
+          - os: macos-15
             platform: mac
             arch: arm64
           - os: windows-latest
@@ -45,10 +42,20 @@ jobs:
         run: pnpm install
 
       - name: Rebuild native dependencies
-        run: pnpm run rebuild
+        run: |
+          if [ "${{ matrix.platform }}" = "mac" ]; then
+            pnpm run rebuild --arch ${{ matrix.arch }}
+          else
+            pnpm run rebuild
+          fi
 
       - name: Build application (sponsored)
-        run: pnpm run build:sponsored:${{ matrix.platform }}
+        run: |
+          if [ "${{ matrix.platform }}" = "mac" ]; then
+            pnpm run build:sponsored:${{ matrix.platform }}:${{ matrix.arch }}
+          else
+            pnpm run build:sponsored:${{ matrix.platform }}
+          fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VITE_SPONSORED: true

.github/workflows/release.yml

@@ -18,13 +18,10 @@ jobs:
     strategy:
       matrix:
         include:
-          - os: macos-latest
-            platform: mac
-            arch: universal
-          - os: macos-latest
+          - os: macos-15-intel
             platform: mac
             arch: x64
-          - os: macos-latest
+          - os: macos-15
             platform: mac
             arch: arm64
           - os: windows-latest
@@ -53,10 +50,20 @@ jobs:
         run: pnpm install
 
       - name: Rebuild native dependencies
-        run: pnpm run rebuild
+        run: |
+          if [ "${{ matrix.platform }}" = "mac" ]; then
+            pnpm run rebuild --arch ${{ matrix.arch }}
+          else
+            pnpm run rebuild
+          fi
 
       - name: Build application
-        run: pnpm run build:${{ matrix.platform }}
+        run: |
+          if [ "${{ matrix.platform }}" = "mac" ]; then
+            pnpm run build:${{ matrix.platform }}:${{ matrix.arch }}
+          else
+            pnpm run build:${{ matrix.platform }}
+          fi
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 

package.json

@@ -17,10 +17,14 @@
     "dev:main": "nodemon",
     "dev:start": "cross-env NODE_ENV=development electronmon .",
     "build": "vite build && npm run build:main && electron-builder",
-    "build:mac": "vite build && npm run build:main && electron-builder --mac --x64 --arm64",
+    "build:mac": "vite build && npm run build:main && npm run build:mac:x64 && npm run build:mac:arm64",
+    "build:mac:x64": "vite build && npm run build:main && electron-builder --mac --x64",
+    "build:mac:arm64": "vite build && npm run build:main && electron-builder --mac --arm64",
     "build:win": "vite build && npm run build:main && electron-builder --win --x64",
     "build:linux": "vite build && npm run build:main && electron-builder --linux --x64",
-    "build:sponsored:mac": "vite build && npm run build:main && electron-builder --config electron-builder.sponsored.json --mac --x64 --arm64",
+    "build:sponsored:mac": "vite build && npm run build:main && npm run build:sponsored:mac:x64 && npm run build:sponsored:mac:arm64",
+    "build:sponsored:mac:x64": "vite build && npm run build:main && electron-builder --config electron-builder.sponsored.json --mac --x64",
+    "build:sponsored:mac:arm64": "vite build && npm run build:main && electron-builder --config electron-builder.sponsored.json --mac --arm64",
     "build:sponsored:win": "vite build && npm run build:main && electron-builder --config electron-builder.sponsored.json --win --x64",
     "build:sponsored:linux": "vite build && npm run build:main && electron-builder --config electron-builder.sponsored.json --linux --x64",
     "build:all": "vite build && npm run build:main && npm run build:mac && npm run build:win && npm run build:linux",