feat: Prepare Apple Silicon release (#478)

Author: manosim

.github/workflows/build-app.yml

@@ -26,37 +26,25 @@ jobs:
       - name: Build
         run: yarn build
 
-      - name: Make macOS (electron-builder)
+      - name: Make macOS x64 (electron-builder)
         env:
           CSC_LINK: ${{ secrets.mac_certs }}
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
-        run: yarn make:macos --publish=never -c.mac.identity=null
+        run: yarn make:macos:x64 --publish=never -c.mac.identity=null
 
-      - name: Clean up builds
-        run: rm -rfv dist/mac
-
-      - uses: actions/upload-artifact@v1
-        with:
-          name: Gitify-dist-mac
-          path: dist
-
-      - name: Clean up dist
-        run: rm -rfv dist
-
-      - name: Make macOS ARM64 (electron-builder)
+      - name: Make macOS arm64 (electron-builder)
         env:
           CSC_LINK: ${{ secrets.mac_certs }}
           CSC_KEY_PASSWORD: ${{ secrets.mac_certs_password }}
-        run: yarn make:macos_arm --publish=never -c.mac.identity=null
-      
+        run: yarn make:macos:arm64 --publish=never -c.mac.identity=null
+
       - name: Clean up builds
-        run: rm -rfv dist/mac-arm64
+        run: rm -rfv dist/mac dist/mac-arm64
 
-      - uses: actions/upload-artifact@v1
+      - uses: actions/upload-artifact@v2
         with:
-          name: Gitify-dist-mac-arm64
-          path: dist
-      
+          name: Gitify-dist-mac
+          path: dist/
 
   build-windows:
     runs-on: windows-2019

.github/workflows/release.yml

@@ -41,8 +41,8 @@ jobs:
           GH_TOKEN: ${{ secrets.gh_token }}
           NOTARIZE: true
         run: |
-          yarn make:macos --publish onTagOrDraft
-          yarn make:macos_arm --publish onTagOrDraft
+          yarn make:macos:x64 --publish onTagOrDraft
+          yarn make:macos:arm64 --publish onTagOrDraft
 
   release-windows:
     runs-on: windows-2019

package.json

@@ -7,8 +7,8 @@
     "build": "webpack --config webpack.prod.js",
     "watch": "webpack --config webpack.common.js --watch",
     "make:linux": "electron-builder --linux",
-    "make:macos": "electron-builder --mac",
-    "make:macos_arm": "electron-builder --mac --arm64",
+    "make:macos:x64": "electron-builder --mac --x64",
+    "make:macos:arm64": "electron-builder --mac --arm64",
     "make:win": "electron-builder --win",
     "prettier:check": "prettier --check 'src/**/*.{js,ts,tsx}'",
     "prettier:apply": "prettier --write 'src/**/*.{js,ts,tsx}'",