From 92e840b216ca8b4920cfc9964c465d8b9d2b262e Mon Sep 17 00:00:00 2001
From: RobertGemmaJr <rgemma.jr@gmail.com>
Date: Wed, 7 Aug 2024 16:24:52 -0400
Subject: [PATCH] ci: Test universal build on arm

---
 .github/workflows/workflow-package.yml | 2 +-
 forge.config.mjs                       | 3 ++-
 package.json                           | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/workflow-package.yml b/.github/workflows/workflow-package.yml
index 51434f61..60009902 100644
--- a/.github/workflows/workflow-package.yml
+++ b/.github/workflows/workflow-package.yml
@@ -102,7 +102,7 @@ jobs:
         if: startsWith(matrix.os, 'mac')
         with:
           name: ${{ format('mac-installer-{0}', github.event.inputs.setting) }}
-          path: out/make/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-x64.dmg
+          path: out/make/${{ steps.package_info.outputs.name }}-${{ steps.package_info.outputs.version }}-universal.dmg
           if-no-files-found: error
       - name: ⬆ Upload installer - Linux
         uses: actions/upload-artifact@v3
diff --git a/forge.config.mjs b/forge.config.mjs
index 871ff565..c6a4eaf2 100644
--- a/forge.config.mjs
+++ b/forge.config.mjs
@@ -5,7 +5,8 @@ export default {
   packagerConfig: {
     asar: true,
     icon: "assets/icons/icon",
-    // osxSign: {},
+    // NOTE: THis is needed for universal but crashes when not using the universal
+    osxSign: {},
   },
   rebuildConfig: {},
   makers: [
diff --git a/package.json b/package.json
index 2023b86f..ce3aeb11 100644
--- a/package.json
+++ b/package.json
@@ -88,7 +88,7 @@
     "make": "electron-forge make",
     "make:windows": "electron-forge make --arch x64 --targets @electron-forge/maker-squirrel",
     "make:linux": "electron-forge make --arch x64 --targets @electron-forge/maker-deb",
-    "make:mac": "electron-forge make --arch x64 --targets @electron-forge/maker-dmg",
+    "make:mac": "electron-forge make --arch universal --targets @electron-forge/maker-dmg",
     "make:mac:OLD": "electron-forge make --arch universal --targets @electron-forge/maker-dmg",
     "cli": "node cli.mjs",
     "commit": "git-cz",