From c6e3d9169ef148c6d3df40f47d775f495e18cfb8 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 08:52:26 +0200 Subject: [PATCH 01/13] adjustment to build process --- gui/electron-builder.json5 | 2 +- gui/package.json | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index 1538bb73..fe82e817 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -5,7 +5,7 @@ "$schema": "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json", "appId": "app.freedata", "asar": true, - "afterSign": "build/notarize_macos.js", + "afterPack": "build/notarize_macos.js", "productName": "FreeDATA", "directories": { "output": "release" diff --git a/gui/package.json b/gui/package.json index ea00c061..7f1ad30d 100644 --- a/gui/package.json +++ b/gui/package.json @@ -1,14 +1,15 @@ { "name": "FreeDATA", - "description": "FreeDATA ", + "description": "FreeDATA", "private": true, - "version": "0.11.0-alpha.1", + "version": "0.11.0-alpha.2", "main": "dist-electron/main/index.js", "scripts": { "start": "git pull && npm i && vite", "dev": "vite", "check": "vue-tsc --noEmit", - "build": "vue-tsc --noEmit && vite build && electron-builder", + "build": "vue-tsc --noEmit && vite build && electron-builder -p never", + "release": "vue-tsc --noEmit && vite build && electron-builder -p onTag", "preview": "vite preview", "lint": "eslint --ext .js,.vue src", "lint-fix": "eslint --ext .js,.vue --fix src" From 56de66e68e86c4d140552cc749f1a06bacd6aa02 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 09:17:44 +0200 Subject: [PATCH 02/13] test with universal support --- gui/build/notarize_macos.js | 5 +++-- gui/electron-builder.json5 | 10 +++++++--- modem/static.py | 2 +- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/gui/build/notarize_macos.js b/gui/build/notarize_macos.js index 313b7502..6cbb37a0 100644 --- a/gui/build/notarize_macos.js +++ b/gui/build/notarize_macos.js @@ -2,12 +2,13 @@ const { notarize } = require('@electron/notarize'); async function notarizing(context) { const { electronPlatformName, appOutDir } = context; - console.log("platform:" + electronPlatformName) + console.log("Notarization...") if (electronPlatformName !== 'darwin') { - console.log("not a APPLE system") + console.log("--> Platform:" + electronPlatformName + " detected: not a APPLE system. Skipping") return; } + console.log("--> Platform:" + electronPlatformName + " detected: Trying to notarize app.") const appName = context.packager.appInfo.productFilename; return await notarize({ diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index fe82e817..3dfef970 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -5,7 +5,7 @@ "$schema": "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json", "appId": "app.freedata", "asar": true, - "afterPack": "build/notarize_macos.js", + "afterSign": "build/notarize_macos.js", "productName": "FreeDATA", "directories": { "output": "release" @@ -30,14 +30,18 @@ "mac": { "target": [ - "dmg" + "default" ], + "arch": [ + "x64", + "universal" + ], "icon": "build/icon.png", "hardenedRuntime": true, "entitlements": "build/entitlements.plist", "entitlementsInherit": "build/entitlements.plist", "gatekeeperAssess": false, - "artifactName": "${productName}-Mac-${version}-Installer.${ext}" + "artifactName": "${productName}-Mac-${version}-Installer.${ext}" }, "win": { "icon": "build/icon.png", diff --git a/modem/static.py b/modem/static.py index 13ca89cb..6a034c9f 100644 --- a/modem/static.py +++ b/modem/static.py @@ -134,7 +134,7 @@ class TCIParam: @dataclass class Modem: - version = "0.11.0-alpha.1-vuejs" + version = "0.11.0-alpha.2" host: str = "0.0.0.0" port: int = 3000 SOCKET_TIMEOUT: int = 1 # seconds From f153b1dbf14dd114d5380eb98a954fad85840257 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 09:19:16 +0200 Subject: [PATCH 03/13] forgot to use new build step --- .github/workflows/build_multiplatform.yml | 2 +- gui/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index 8d6533b0..ff12a16f 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -372,7 +372,7 @@ jobs: working-directory: gui run: | npm i - npm run build + npm run release - name: Compress Modem uses: thedoctor0/zip-release@master diff --git a/gui/package.json b/gui/package.json index 7f1ad30d..4043e23a 100644 --- a/gui/package.json +++ b/gui/package.json @@ -2,7 +2,7 @@ "name": "FreeDATA", "description": "FreeDATA", "private": true, - "version": "0.11.0-alpha.2", + "version": "0.11.0-alpha.3", "main": "dist-electron/main/index.js", "scripts": { "start": "git pull && npm i && vite", From 5d6f677a5e2a9dbe68ff7f0521e4ac8a0142922f Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 09:46:56 +0200 Subject: [PATCH 04/13] adjusted build step again --- gui/electron-builder.json5 | 13 ++++++++----- gui/package.json | 2 +- modem/static.py | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index 3dfef970..811ceef7 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -30,12 +30,15 @@ "mac": { "target": [ - "default" + { + "target": "default", + "arch": [ + "x64", + "universal" + ] + } ], - "arch": [ - "x64", - "universal" - ], + "icon": "build/icon.png", "hardenedRuntime": true, "entitlements": "build/entitlements.plist", diff --git a/gui/package.json b/gui/package.json index 4043e23a..564d7cfc 100644 --- a/gui/package.json +++ b/gui/package.json @@ -2,7 +2,7 @@ "name": "FreeDATA", "description": "FreeDATA", "private": true, - "version": "0.11.0-alpha.3", + "version": "0.11.0-alpha.4", "main": "dist-electron/main/index.js", "scripts": { "start": "git pull && npm i && vite", diff --git a/modem/static.py b/modem/static.py index 6a034c9f..30e2631d 100644 --- a/modem/static.py +++ b/modem/static.py @@ -134,7 +134,7 @@ class TCIParam: @dataclass class Modem: - version = "0.11.0-alpha.2" + version = "0.11.0-alpha.4" host: str = "0.0.0.0" port: int = 3000 SOCKET_TIMEOUT: int = 1 # seconds From 6be61b8706e771bcdd2ab169555857a7210fb28a Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 10:14:50 +0200 Subject: [PATCH 05/13] test with notarize options in electron builder --- gui/electron-builder.json5 | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index 811ceef7..4e5548ba 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -5,7 +5,7 @@ "$schema": "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json", "appId": "app.freedata", "asar": true, - "afterSign": "build/notarize_macos.js", + //"afterSign": "build/notarize_macos.js", "productName": "FreeDATA", "directories": { "output": "release" @@ -32,12 +32,11 @@ "target": [ { "target": "default", - "arch": [ - "x64", - "universal" - ] } ], + "notarize": { + "tool": "notarytool" + }, "icon": "build/icon.png", "hardenedRuntime": true, From 920e46754b50bc9f5dee4d442232cc0c2531843e Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 11:21:02 +0200 Subject: [PATCH 06/13] adjusted electorn builder config --- gui/electron-builder.json5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index 4e5548ba..eb66853e 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -34,7 +34,7 @@ "target": "default", } ], - "notarize": { + "notarization": { "tool": "notarytool" }, From ef980463138cf79e2183ed8e150c0c57fcdc88ee Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 11:59:36 +0200 Subject: [PATCH 07/13] moved back to default --- gui/electron-builder.json5 | 3 --- 1 file changed, 3 deletions(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index eb66853e..e6f41cc0 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -34,9 +34,6 @@ "target": "default", } ], - "notarization": { - "tool": "notarytool" - }, "icon": "build/icon.png", "hardenedRuntime": true, From 1efd6d543998a3534b8e7cd186ecae7c33997296 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 12:00:52 +0200 Subject: [PATCH 08/13] another tool test --- gui/electron-builder.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index e6f41cc0..b4348f0a 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -34,6 +34,7 @@ "target": "default", } ], + "notarize": "notarytool", "icon": "build/icon.png", "hardenedRuntime": true, From 4dc5a482e05a83739566623ff02dfa8d069e77b9 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 12:01:18 +0200 Subject: [PATCH 09/13] tried to disable default notarization --- gui/electron-builder.json5 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index b4348f0a..6dee36ce 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -5,7 +5,7 @@ "$schema": "https://raw.githubusercontent.com/electron-userland/electron-builder/master/packages/app-builder-lib/scheme.json", "appId": "app.freedata", "asar": true, - //"afterSign": "build/notarize_macos.js", + "afterSign": "build/notarize_macos.js", "productName": "FreeDATA", "directories": { "output": "release" @@ -34,7 +34,7 @@ "target": "default", } ], - "notarize": "notarytool", + "notarize": "false", "icon": "build/icon.png", "hardenedRuntime": true, From 053215a6bbe7a14b52ae5b61dcaffdd5343b4bd8 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 12:24:38 +0200 Subject: [PATCH 10/13] final build test --- gui/electron-builder.json5 | 1 - gui/package.json | 2 +- modem/static.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index 6dee36ce..1d656b43 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -35,7 +35,6 @@ } ], "notarize": "false", - "icon": "build/icon.png", "hardenedRuntime": true, "entitlements": "build/entitlements.plist", diff --git a/gui/package.json b/gui/package.json index 564d7cfc..29bdcc43 100644 --- a/gui/package.json +++ b/gui/package.json @@ -2,7 +2,7 @@ "name": "FreeDATA", "description": "FreeDATA", "private": true, - "version": "0.11.0-alpha.4", + "version": "0.11.0-alpha.5", "main": "dist-electron/main/index.js", "scripts": { "start": "git pull && npm i && vite", diff --git a/modem/static.py b/modem/static.py index 30e2631d..c3cdc1d9 100644 --- a/modem/static.py +++ b/modem/static.py @@ -134,7 +134,7 @@ class TCIParam: @dataclass class Modem: - version = "0.11.0-alpha.4" + version = "0.11.0-alpha.5" host: str = "0.0.0.0" port: int = 3000 SOCKET_TIMEOUT: int = 1 # seconds From ef3fa719827672fab443ba2d5bbc6ea45f23eee2 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 12:34:58 +0200 Subject: [PATCH 11/13] test with universal builds --- gui/electron-builder.json5 | 1 + 1 file changed, 1 insertion(+) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index 1d656b43..9628baa3 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -32,6 +32,7 @@ "target": [ { "target": "default", + "arch": ["arm64", "x64"] } ], "notarize": "false", From 5fbb2569695739c2e98ae4896f190f732d3e6724 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 13:00:24 +0200 Subject: [PATCH 12/13] added arm64 arch --- gui/electron-builder.json5 | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gui/electron-builder.json5 b/gui/electron-builder.json5 index 9628baa3..8f6d2b5d 100644 --- a/gui/electron-builder.json5 +++ b/gui/electron-builder.json5 @@ -48,9 +48,7 @@ "target": [ { "target": "nsis", - "arch": [ - "x64" - ] + "arch": ["arm64", "x64"] } ], "artifactName": "${productName}-Windows-${version}-Setup.${ext}" From a473199954aa8fde8b01930f3adb150f4bb61760 Mon Sep 17 00:00:00 2001 From: DJ2LS Date: Mon, 23 Oct 2023 13:06:55 +0200 Subject: [PATCH 13/13] await arm builds before continuing --- .github/workflows/build_multiplatform.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_multiplatform.yml b/.github/workflows/build_multiplatform.yml index ff12a16f..620881fa 100644 --- a/.github/workflows/build_multiplatform.yml +++ b/.github/workflows/build_multiplatform.yml @@ -188,7 +188,7 @@ jobs: path: artifacts/* build_i686_x64_release: - needs: [BUILD_AMD64] + needs: [BUILD_AMD64, BUILD_ARM] name: Build FreeDATA packages runs-on: ${{ matrix.os }} strategy: