Build mac executables in ADO (#1017)

build.yaml

@@ -64,23 +64,6 @@ jobs:
                 artifactName: 'drop'
             displayName: publish drop
 
-    # CI build only
-    - job: 'publish_electron_dist'
-      condition: and(always(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
-      pool:
-          vmImage: 'windows-latest'
-      steps:
-          - template: pipeline/install-node-prerequisites.yaml
-
-          - script: yarn dist:electron -wl
-            displayName: create electron distributables (windows, linux)
-
-          - task: PublishBuildArtifacts@1
-            inputs:
-                pathtoPublish: '$(System.DefaultWorkingDirectory)/dist'
-                artifactName: 'dist'
-            displayName: publish dist
-
     - job: 'electron_tests_mac'
       pool:
           vmImage: macOS-10.14
@@ -104,3 +87,23 @@ jobs:
           - template: pipeline/install-node-prerequisites.yaml
           - template: pipeline/electron/electron-e2e-test-interactive.yaml
           - template: pipeline/electron/electron-e2e-publish-results.yaml
+
+    # CI build only
+    - job: 'publish_electron_windows_linux'
+      condition: and(always(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
+      pool:
+          vmImage: 'windows-latest'
+      steps:
+          - template: pipeline/electron/distribute-electron.yaml
+            parameters:
+                platforms: -wl
+
+    # CI build only
+    - job: 'publish_electron_mac'
+      condition: and(always(), in(variables['Build.Reason'], 'IndividualCI', 'BatchedCI'))
+      pool:
+          vmImage: 'macOS-10.14'
+      steps:
+          - template: pipeline/electron/distribute-electron.yaml
+            parameters:
+                platforms: -m

electron-builder.yml

@@ -0,0 +1,10 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+appId: com.aimobile.app
+directories:
+    app: drop/electron
+extraMetadata:
+    main: extension/bundle/main.bundle.js
+    name: ai-mobile
+mac:
+    target: dmg # can be changed to a zip, app or something else. ref: https://www.electron.build/configuration/mac

package.json

@@ -19,7 +19,7 @@
         "build:prod": "grunt build-prod",
         "copyrightheaders": "grunt copyright-check",
         "copyrightheaders:fix": "grunt copyright-add",
-        "dist:electron": "yarn build:electron && electron-builder -c.extraMetadata.main=drop/electron/extension/bundle/main.bundle.js -c.extraMetadata.name=ai-mobile -p never",
+        "dist:electron": "yarn build:electron && electron-builder -p never",
         "format": "prettier --config prettier.config.js --write \"**/*\"",
         "format-check": "prettier --config prettier.config.js --check \"**/*\"",
         "generate-scss-typings": "tsm \"src/**/*.scss\"",

pipeline/electron/distribute-electron.yaml

@@ -0,0 +1,17 @@
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License.
+
+parameters:
+    platforms: '' # electron-builder platforms, e.g. -wl for win/linux, -m for mac, etc
+
+steps:
+    - template: ../install-node-prerequisites.yaml
+
+    - script: yarn dist:electron ${{ parameters.platforms }}
+      displayName: create electron distributables
+
+    - task: PublishBuildArtifacts@1
+      inputs:
+          pathtoPublish: '$(System.DefaultWorkingDirectory)/dist'
+          artifactName: $(Agent.JobName)
+      displayName: publish dist