From 8fcead947db6b176a295d1641c8ee817c0689410 Mon Sep 17 00:00:00 2001
From: cutls <web-pro@cutls.com>
Date: Mon, 10 Oct 2022 23:44:27 +0900
Subject: [PATCH] electron-userland/electron-builder issue 7050

---
 .github/workflows/build-debug-macos.yml |  2 +-
 app/build.js                            | 14 ++++++++------
 app/package.json                        |  2 +-
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/build-debug-macos.yml b/.github/workflows/build-debug-macos.yml
index 7eaf1cc8..39f48659 100644
--- a/.github/workflows/build-debug-macos.yml
+++ b/.github/workflows/build-debug-macos.yml
@@ -28,7 +28,7 @@ jobs:
       with:
         node-version: ${{ matrix.node-version }}
     - run: cd app && yarn
-    - run: cd app && yarn build:all
+    - run: cd app && yarn build --skipX64 --withArm64
     - name: Deploy to S3
       env:
         AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
diff --git a/app/build.js b/app/build.js
index a4c0e228..b5719607 100644
--- a/app/build.js
+++ b/app/build.js
@@ -174,11 +174,13 @@ async function cmd(options) {
         if (platform === 'darwin' && !isTrue(options, 'skipMacOS')) {
             if (isTrue(options, 'unnotarize')) delete config.afterSign
             if (arch === 'x64') {
-                await build(Platform.MAC, Arch.x64, config)
-                fs.renameSync(
-                    `../build/TheDesk-${version}.dmg`,
-                    `../build/TheDesk-${version}-x64.dmg`
-                )
+                if (!isTrue(options, 'skipX64')) {
+                    await build(Platform.MAC, Arch.x64, config)
+                    fs.renameSync(
+                        `../build/TheDesk-${version}.dmg`,
+                        `../build/TheDesk-${version}-x64.dmg`
+                    )
+                }
                 if (isTrue(options, 'withArm64')) {
                     await build(Platform.MAC, Arch.arm64, config)
                     fs.renameSync(
@@ -198,7 +200,7 @@ async function cmd(options) {
                     `../build/TheDesk-${version}.dmg`,
                     `../build/TheDesk-${version}-arm64.dmg`
                 )
-                if (isTrue(options, 'skipX64')) await build(Platform.MAC, Arch.x64, config)
+                if (!isTrue(options, 'skipX64')) await build(Platform.MAC, Arch.x64, config)
             }
 
         }
diff --git a/app/package.json b/app/package.json
index 56dba361..1116dd5d 100644
--- a/app/package.json
+++ b/app/package.json
@@ -79,7 +79,7 @@
         "browserify": "^17.0.0",
         "chokidar": "^3.5.2",
         "dotenv": "^10.0.0",
-        "electron": "^21.1.0",
+        "electron": "^19.0.11",
         "electron-builder": "^23.2.0",
         "electron-notarize": "^1.2.1",
         "electron-rebuild": "^3.2.9",