feat: build for arm64 on MacOS

Closes #1996 Closes #4236
camunda · Apr 11, 2024 · 2f285e2 · 2f285e2
1 parent 6245e57
commit 2f285e2
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 109 deletions.
diff --git a/.github/workflows/NIGHTLY.yml b/.github/workflows/NIGHTLY.yml
@@ -12,8 +12,10 @@ jobs:
           - 'dist/camunda-modeler-nightly-linux-x64.tar.gz'
         - os: macos-12
           files:
-          - 'dist/camunda-modeler-nightly-mac.dmg'
-          - 'dist/camunda-modeler-nightly-mac.zip'
+          - 'dist/camunda-modeler-nightly-mac-arm64.dmg'
+          - 'dist/camunda-modeler-nightly-mac-arm64.zip'
+          - 'dist/camunda-modeler-nightly-mac-x64.dmg'
+          - 'dist/camunda-modeler-nightly-mac-x64.zip'
         - os: windows-2022
           files:
           - 'dist/camunda-modeler-nightly-win-ia32.zip'

diff --git a/electron-builder.json b/electron-builder.json
@@ -13,7 +13,6 @@
   ],
   "afterPack": "./tasks/after-pack.js",
   "afterSign": "./tasks/after-sign.js",
-  "afterAllArtifactBuild": "./tasks/after-all-artifact-build.js",
   "win": {
     "target": [
       {
@@ -34,7 +33,16 @@
   "mac": {
     "hardenedRuntime": true,
     "entitlements": "./build/entitlements.mac.inherit.plist",
-    "target": "dmg"
+    "target": [
+      {
+        "target": "dmg",
+        "arch": [ "x64", "arm64" ]
+      },
+      {
+        "target": "zip",
+        "arch": [ "x64", "arm64" ]
+      }
+    ]
   },
   "fileAssociations": [
     {

diff --git a/tasks/after-all-artifact-build.js b/tasks/after-all-artifact-build.js
diff --git a/tasks/after-all-artifact-build/build-mac-zip.js b/tasks/after-all-artifact-build/build-mac-zip.js
diff --git a/tasks/distro.js b/tasks/distro.js
@@ -78,7 +78,6 @@ if (nightly) {
 
 const artifactOptions = [
   '-c.artifactName=${name}-${version}-${os}-${arch}.${ext}',
-  '-c.dmg.artifactName=${name}-${version}-${os}.${ext}',
   '-c.nsis.artifactName=${name}-${version}-${os}-setup.${ext}',
   '-c.nsisWeb.artifactName=${name}-${version}-${os}-web-setup.${ext}',
   argv.compress === false && '-c.compression=store'
@@ -105,12 +104,12 @@ if (certificateFingerprint) {
   signingOptions.push(`-c.win.certificateSha1=${certificateFingerprint}`);
 }
 
-if (publish && (argv.ia32 || argv.x64)) {
+if (publish && (argv.ia32 || argv.x64 || argv.arm64)) {
   console.error('Do not override arch; is manually pinned');
   process.exit(1);
 }
 
-const archOptions = [ 'x64', 'ia32' ].filter(a => argv[a]).map(a => `--${a}`);
+const archOptions = [ 'x64', 'ia32', 'arm64' ].filter(a => argv[a]).map(a => `--${a}`);
 
 const extraMetadataOptions = [
   `-c.extraMetadata.SENTRY_DSN=${ process.env.SENTRY_DSN || null }`

diff --git a/tasks/test-distro.js b/tasks/test-distro.js
@@ -82,10 +82,13 @@ const expectedFiles = {
     }
   ],
   mac: [
-    'camunda-modeler-${version}-mac.dmg',
     {
-      name: 'camunda-modeler-${version}-mac.zip',
-      archs: [ 'x64' ],
+      name: 'camunda-modeler-${version}-mac-${arch}.dmg',
+      archs: [ 'x64', 'arm64' ]
+    },
+    {
+      name: 'camunda-modeler-${version}-mac-${arch}.zip',
+      archs: [ 'x64', 'arm64' ],
       contents: [
         'Camunda Modeler.app/Contents/Info.plist'
       ]