From 9f2fdd52a01c61ffb2fcb9c98375aaf54afc2b00 Mon Sep 17 00:00:00 2001
From: Anthony Gress <the.techx.guy@gmail.com>
Date: Wed, 22 Jan 2025 18:17:14 -0500
Subject: [PATCH] fix cicd command for building release skipping win x64 build

---
 .github/workflows/publish.yml | 2 +-
 package.json                  | 7 ++-----
 release/app/package.json      | 2 +-
 src/main/utils/executeCmd.ts  | 2 +-
 4 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
index e0e4c32..8beb1d7 100644
--- a/.github/workflows/publish.yml
+++ b/.github/workflows/publish.yml
@@ -39,4 +39,4 @@ jobs:
         run: |
           npm run postinstall
           npm run build
-          npm exec electron-builder -- --publish always --win --mac --linux
+          npm release
diff --git a/package.json b/package.json
index 181efca..d7913a2 100644
--- a/package.json
+++ b/package.json
@@ -4,6 +4,7 @@
   "scripts": {
     "build": "concurrently \"npm run build:main\" \"npm run build:renderer\"",
     "build:main": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.main.prod.ts",
+    "clean": "ts-node .erb/scripts/clean.js",
     "build:renderer": "cross-env NODE_ENV=production TS_NODE_TRANSPILE_ONLY=true webpack --config ./.erb/configs/webpack.config.renderer.prod.ts",
     "rebuild": "electron-rebuild --parallel --types prod,dev,optional --module-dir src",
     "lint": "cross-env NODE_ENV=development eslint . --cache --ext .js,.jsx,.ts,.tsx",
@@ -18,7 +19,7 @@
     "start:renderer": "cross-env NODE_ENV=development TS_NODE_TRANSPILE_ONLY=true webpack serve --config ./.erb/configs/webpack.config.renderer.dev.ts",
     "test": "jest",
     "prepare": "husky install",
-    "release": "npm exec electron-builder -- --publish always --linux --x64 && npm exec electron-builder -- --publish always --win --mac --linux"
+    "release": "npm exec electron-builder -- --publish always --linux --x64 && npm exec electron-builder -- --publish always --win --x64 && npm exec electron-builder -- --publish always --mac --arm64 --linux --arm64"
   },
   "lint-staged": {
     "*.{js,jsx,ts,tsx}": [
@@ -223,10 +224,6 @@
     "semver": "^7.5.4",
     "sweetalert2": "^11.7.12"
   },
-  "devEngines": {
-    "node": ">=14.x",
-    "npm": ">=7.x"
-  },
   "browserslist": [],
   "prettier": {
     "overrides": [
diff --git a/release/app/package.json b/release/app/package.json
index b5c177c..398fadd 100644
--- a/release/app/package.json
+++ b/release/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "android-toolkit",
-  "version": "1.5.23",
+  "version": "1.5.24",
   "description": "Universal app with gui for simple adb connection",
   "main": "./dist/main/main.js",
   "author": {
diff --git a/src/main/utils/executeCmd.ts b/src/main/utils/executeCmd.ts
index 966553a..08471cc 100644
--- a/src/main/utils/executeCmd.ts
+++ b/src/main/utils/executeCmd.ts
@@ -1,5 +1,5 @@
-import util from 'node:util';
 const { spawn } = require('node:child_process');
+import util from 'node:util';
 
 const { exec } = require('child_process');
 export const execPromise = util.promisify(exec);