From 38788b67dcd83ae43bcecf9fddc4edc15dac53ae Mon Sep 17 00:00:00 2001 From: nitro Date: Wed, 17 Mar 2021 15:43:53 -0400 Subject: [PATCH 1/3] Add --universal to mac builds --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 981680d2e0e..c4a0f0c0e9b 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ "clean:l10n": "git push origin --delete l10n_master", "pack:dir": "npm run clean:dist && electron-builder --dir -p never", "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never", - "pack:mac": "npm run clean:dist && electron-builder --mac -p never", - "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas -p never", - "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev -p never", + "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never", + "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never", + "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never", "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"", "pack:win:ci": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never", "dist:dir": "npm run build && npm run pack:dir", From 2d3c9809bc46807a0452b8fa69696853f0e4a493 Mon Sep 17 00:00:00 2001 From: nitro Date: Wed, 17 Mar 2021 18:06:23 -0400 Subject: [PATCH 2/3] Separate pack:mac_arm64 target --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index c4a0f0c0e9b..1702ec6319e 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,8 @@ "clean:l10n": "git push origin --delete l10n_master", "pack:dir": "npm run clean:dist && electron-builder --dir -p never", "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never", - "pack:mac": "npm run clean:dist && electron-builder --mac --universal -p never", + "pack:mac": "npm run clean:dist && electron-builder --mac -p never", + "pack:mac_arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never", "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never", "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never", "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"", From 5be6475c83dcdd53740c175a8ec82929802021ee Mon Sep 17 00:00:00 2001 From: nitro Date: Thu, 18 Mar 2021 14:14:20 -0400 Subject: [PATCH 3/3] Consistency using colons instead of underscore Co-authored-by: Chad Scharf <3904944+cscharf@users.noreply.github.com> --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 1702ec6319e..9337a4e8d02 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "pack:dir": "npm run clean:dist && electron-builder --dir -p never", "pack:lin": "npm run clean:dist && electron-builder --linux --x64 -p never", "pack:mac": "npm run clean:dist && electron-builder --mac -p never", - "pack:mac_arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never", + "pack:mac:arm64": "npm run clean:dist && electron-builder --mac --arm64 -p never", "pack:mac:mas": "npm run clean:dist && electron-builder --mac mas --universal -p never", "pack:mac:masdev": "npm run clean:dist && electron-builder --mac mas-dev --universal -p never", "pack:win": "npm run clean:dist && electron-builder --win --x64 --arm64 --ia32 -p never -c.win.certificateSubjectName=\"8bit Solutions LLC\"",