Merge pull request #486 from DJ2LS/ls-github-action

adjustment to build process

.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:
@@ -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

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({

gui/electron-builder.json5

@@ -30,23 +30,25 @@
 
   "mac": {
     "target": [
-      "dmg"
+      {
+        "target": "default",
+        "arch": ["arm64", "x64"]
+      }
     ],
+    "notarize": "false",
       "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",
     "target": [
       {
         "target": "nsis",
-        "arch": [
-          "x64"
-        ]
+        "arch": ["arm64", "x64"]
       }
     ],
     "artifactName": "${productName}-Windows-${version}-Setup.${ext}"

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.5",
   "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"

modem/static.py

@@ -134,7 +134,7 @@ class TCIParam:
 
 @dataclass 
 class Modem:
-    version = "0.11.0-alpha.1-vuejs"
+    version = "0.11.0-alpha.5"
     host: str = "0.0.0.0"
     port: int = 3000
     SOCKET_TIMEOUT: int = 1  # seconds