From 53361e3ca3788dc29160b595d157543b2d943f46 Mon Sep 17 00:00:00 2001
From: Jan Prochazka <jan.prochazka@gmail.com>
Date: Tue, 25 Jan 2022 20:10:32 +0100
Subject: [PATCH] mac build cleanup

---
 .github/workflows/build-app-beta.yaml | 8 --------
 app/package.json                      | 1 -
 app/setMacPlatform.js                 | 8 --------
 package.json                          | 1 -
 4 files changed, 18 deletions(-)
 delete mode 100644 app/setMacPlatform.js

diff --git a/.github/workflows/build-app-beta.yaml b/.github/workflows/build-app-beta.yaml
index 8c37a686..ad3eb925 100644
--- a/.github/workflows/build-app-beta.yaml
+++ b/.github/workflows/build-app-beta.yaml
@@ -42,7 +42,6 @@ jobs:
         if: matrix.os == 'ubuntu-18.04'
         uses: samuelmeuli/action-snapcraft@v1
       - name: Publish
-        # if: matrix.os != 'macOS-10.15'
         run: |
           yarn run build:app
         env:
@@ -50,13 +49,6 @@ jobs:
           WIN_CSC_LINK: ${{ secrets.WINCERT_CERTIFICATE }}
           WIN_CSC_KEY_PASSWORD: ${{ secrets.WINCERT_PASSWORD }}
 
-      # - name: Publish Mac
-      #   if: matrix.os == 'macOS-10.15'
-      #   run: |
-      #     yarn run build:app:mac
-      #   env:
-      #     GH_TOKEN: ${{ secrets.GH_TOKEN }} # token for electron publish
-
       - name: Save snap login
         if: matrix.os == 'ubuntu-18.04'
         run: 'echo "$SNAPCRAFT_LOGIN" > snapcraft.login'
diff --git a/app/package.json b/app/package.json
index bacda4e3..af5a3edc 100644
--- a/app/package.json
+++ b/app/package.json
@@ -92,7 +92,6 @@
     "start:local": "cross-env electron .",
     "dist": "electron-builder",
     "build": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn dist",
-    "build:mac": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && node setMacPlatform x64 && yarn dist && node setMacPlatform arm64 && yarn dist",
     "build:local": "cd ../packages/api && yarn build && cd ../web && yarn build && cd ../../app && yarn predist",
     "postinstall": "yarn rebuild && patch-package",
     "rebuild": "electron-builder install-app-deps",
diff --git a/app/setMacPlatform.js b/app/setMacPlatform.js
deleted file mode 100644
index ccf644ef..00000000
--- a/app/setMacPlatform.js
+++ /dev/null
@@ -1,8 +0,0 @@
-const fs = require('fs');
-
-const text = fs.readFileSync('package.json', { encoding: 'utf-8' });
-const json = JSON.parse(text);
-
-json.build.mac.target.arch = process.argv[2];
-
-fs.writeFileSync('package.json', JSON.stringify(json, null, 2), { encoding: 'utf-8' });
diff --git a/package.json b/package.json
index fa1ce18a..be6ba1b0 100644
--- a/package.json
+++ b/package.json
@@ -25,7 +25,6 @@
     "build:tools": "yarn workspace dbgate-tools build",
     "build:lib": "yarn build:querysplitter && yarn build:tools && yarn build:sqltree && yarn build:filterparser && yarn build:datalib",
     "build:app": "yarn plugins:copydist && cd app && yarn install && yarn build",
-    "build:app:mac": "yarn plugins:copydist && cd app && yarn install && yarn build:mac",
     "build:api": "yarn workspace dbgate-api build",
     "build:web:docker": "yarn workspace dbgate-web build",
     "build:plugins:frontend": "workspaces-run --only=\"dbgate-plugin-*\" -- yarn build:frontend",