electron 11 cleanup

.github/workflows/macos.yml

@@ -3,6 +3,11 @@ on: [push, pull_request]
 jobs:
   build:
     runs-on: macOS-latest
+    strategy:
+      matrix:
+        include:
+          - arch: x86_64
+          - arch: arm64
 
     steps:
     - name: Checkout
@@ -24,12 +29,16 @@ jobs:
 
     - name: Build native deps
       run: scripts/build-native.js
+      env:
+        ARCH: ${{arch}}
 
     - name: Webpack
       run: yarn run build
 
     - name: Prepackage plugins
       run: scripts/prepackage-plugins.js
+      env:
+        ARCH: ${{arch}}
 
     - run: sed -i '' 's/updateInfo = await/\/\/updateInfo = await/g' node_modules/app-builder-lib/out/targets/ArchiveTarget.js
 
@@ -37,18 +46,20 @@ jobs:
       run: scripts/build-macos.js
       if: github.repository == 'Eugeny/terminus' && github.event_name == 'push'
       env:
-        #DEBUG: electron-builder,electron-builder:*
+        ARCH: ${{arch}}
         GH_TOKEN: ${{ secrets.GH_TOKEN }}
         CSC_LINK: ${{ secrets.CSC_LINK }}
         CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }}
         APPSTORE_USERNAME: ${{ secrets.APPSTORE_USERNAME }}
         APPSTORE_PASSWORD: ${{ secrets.APPSTORE_PASSWORD }}
+        # DEBUG: electron-builder,electron-builder:*
 
     - name: Build packages without signing
       run: scripts/build-macos.js
       if: github.repository != 'Eugeny/terminus' || github.event_name != 'push'
       env:
-        DEBUG: electron-builder,electron-builder:*
+        ARCH: ${{arch}}
+        # DEBUG: electron-builder,electron-builder:*
 
     - name: Package artifacts
       run: |
@@ -60,11 +71,11 @@ jobs:
     - uses: actions/upload-artifact@master
       name: Upload PKG
       with:
-        name: macOS .pkg
+        name: macOS .pkg (${{arch}})
         path: artifact-pkg
 
     - uses: actions/upload-artifact@master
       name: Upload ZIP
       with:
-        name: macOS .zip
+        name: macOS .zip (${{arch}})
         path: artifact-zip