From e0e199375ad19a3244f3b9c1e31bcfc5ec5c8a95 Mon Sep 17 00:00:00 2001
From: yougotwill <yougotwill94@gmail.com>
Date: Fri, 24 Jan 2025 16:51:35 +1100
Subject: [PATCH] feat: use separate matrix strategies for each architecture

revert build target in package.json so we only build one architecture depending on the runner
---
 .github/workflows/build-binaries.yml |  6 +++---
 package.json                         | 26 ++------------------------
 2 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/.github/workflows/build-binaries.yml b/.github/workflows/build-binaries.yml
index bcd4b8d42..52d6f9cd0 100644
--- a/.github/workflows/build-binaries.yml
+++ b/.github/workflows/build-binaries.yml
@@ -120,8 +120,8 @@ jobs:
   build_macos:
     strategy:
       matrix:
-        os: [macos-14]
-        arch: ['arm64', 'x64']
+        os: [macos-14, macos-13]
+        arch: [arm64, x64]
     runs-on: ${{ matrix.os }}
     env:
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -139,7 +139,7 @@ jobs:
       - name: Setup & Build
         uses: ./actions/setup_and_build
         with:
-          cache_suffix: 'macos'
+          cache_suffix: ${{ matrix.os }}-${{ matrix.arch }}
 
         # we want to test on all platforms since some are testing the rendered menus (and are dependent on the platform)
       - name: Unit Test
diff --git a/package.json b/package.json
index 2cb833beb..8936098a1 100644
--- a/package.json
+++ b/package.json
@@ -227,30 +227,8 @@
       "category": "public.app-category.social-networking",
       "icon": "build/icon-mac.icns",
       "target": [
-        {
-          "target": "dmg",
-          "arch": [
-            "arm64"
-          ]
-        },
-        {
-          "target": "zip",
-          "arch": [
-            "arm64"
-          ]
-        },
-        {
-          "target": "dmg",
-          "arch": [
-            "x64"
-          ]
-        },
-        {
-          "target": "zip",
-          "arch": [
-            "x64"
-          ]
-        }
+        "dmg",
+        "zip"
       ],
       "bundleVersion": "1",
       "hardenedRuntime": true,