Merge pull request #8160 from kidroca/kidroca/feat/desktop-one-arch-p…

…er-build
Expensify · Mar 22, 2022 · 6f6eaaa · 6f6eaaa
2 parents 36ae0cf + f69b1b7
commit 6f6eaaa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/config/electronBuilder.config.js b/config/electronBuilder.config.js
@@ -15,10 +15,6 @@ module.exports = {
     },
     mac: {
         category: 'public.app-category.finance',
-        target: [
-            {target: 'dmg', arch: ['x64', 'arm64', 'universal']},
-            {target: 'zip', arch: ['x64', 'arm64', 'universal']},
-        ],
         icon: isStaging ? './desktop/icon-stg.png' : './desktop/icon.png',
         hardenedRuntime: true,
         entitlements: 'desktop/entitlements.mac.plist',
@@ -27,7 +23,7 @@ module.exports = {
     },
     dmg: {
         title: 'New Expensify',
-        artifactName: 'NewExpensify.dmg',
+        artifactName: `NewExpensify${process.env.ARTIFACT_SUFFIX || ''}.dmg`,
         internetEnabled: true,
     },
     publish: [{

diff --git a/scripts/build-desktop.sh b/scripts/build-desktop.sh
@@ -24,4 +24,6 @@ info ""
 title "Building Desktop App Archive Using Electron"
 info ""
 shift 1
-"$LOCAL_PACKAGES/electron-builder" --config config/electronBuilder.config.js "$@"
+"$LOCAL_PACKAGES/electron-builder" --config config/electronBuilder.config.js --x64 "$@"
+export ARTIFACT_SUFFIX="-arm64"
+"$LOCAL_PACKAGES/electron-builder" --config config/electronBuilder.config.js --arm64 "$@"