From 4bb0783790a4661ebcbe1b1ab9fdf27736e1a4b1 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 13 May 2025 22:06:06 +0300 Subject: [PATCH 1/6] chore(signing): add debug logs --- apps/desktop/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 578c0f816..7363da732 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -101,13 +101,13 @@ "dependsOn": [ "build" ], - "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge make dist" + "command": "pnpm -C apps/desktop exec cross-env DEBUG=* NODE_INSTALLER=npm electron-forge make dist" }, "electron-forge:package": { "dependsOn": [ "build" ], - "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge package dist" + "command": "pnpm -C apps/desktop exec cross-env DEBUG=* NODE_INSTALLER=npm electron-forge package dist" } } } From 293167c93e776f232d3041c58da63f98cf98835b Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Tue, 13 May 2025 22:38:57 +0300 Subject: [PATCH 2/6] chore(signing): remove lstat --- apps/desktop/electron-forge/sign-windows.cjs | 3 --- 1 file changed, 3 deletions(-) diff --git a/apps/desktop/electron-forge/sign-windows.cjs b/apps/desktop/electron-forge/sign-windows.cjs index 12246842d..f1905bb5c 100644 --- a/apps/desktop/electron-forge/sign-windows.cjs +++ b/apps/desktop/electron-forge/sign-windows.cjs @@ -5,9 +5,6 @@ const { default: path } = require("path"); module.exports = function (filePath) { const { WINDOWS_SIGN_EXECUTABLE } = process.env; - const stats = fs.lstatSync(filePath); - console.log(filePath, stats); - if (!WINDOWS_SIGN_EXECUTABLE) { console.warn("[Sign] Skip signing due to missing environment variable."); return; From f4e2296d9b050ffad0d34058574edb52b5116053 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 14 May 2025 09:02:37 +0300 Subject: [PATCH 3/6] fix(signing): wrong path import --- apps/desktop/electron-forge/sign-windows.cjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/desktop/electron-forge/sign-windows.cjs b/apps/desktop/electron-forge/sign-windows.cjs index f1905bb5c..84d1897b6 100644 --- a/apps/desktop/electron-forge/sign-windows.cjs +++ b/apps/desktop/electron-forge/sign-windows.cjs @@ -1,6 +1,6 @@ const child_process = require("child_process"); const fs = require("fs"); -const { default: path } = require("path"); +const path = require("path"); module.exports = function (filePath) { const { WINDOWS_SIGN_EXECUTABLE } = process.env; From 1abcf7244f3a62d0e4284f31df32ac7b4ab068e5 Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 14 May 2025 09:25:19 +0300 Subject: [PATCH 4/6] fix(signing): fix wrong source path --- apps/desktop/electron-forge/sign-windows.cjs | 2 -- 1 file changed, 2 deletions(-) diff --git a/apps/desktop/electron-forge/sign-windows.cjs b/apps/desktop/electron-forge/sign-windows.cjs index 84d1897b6..23073ade2 100644 --- a/apps/desktop/electron-forge/sign-windows.cjs +++ b/apps/desktop/electron-forge/sign-windows.cjs @@ -16,8 +16,6 @@ module.exports = function (filePath) { fs.mkdirSync(outputDir); } - fs.copyFileSync(sourcePath, destPath); - const command = `${WINDOWS_SIGN_EXECUTABLE} --executable "${filePath}"`; console.log(`[Sign] ${command}`); From 4adaf97127d44d7c2c168ecb959387ade4f5c70d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 14 May 2025 13:03:09 +0300 Subject: [PATCH 5/6] feat(signing): improve error logging in case of error --- apps/desktop/electron-forge/sign-windows.cjs | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/apps/desktop/electron-forge/sign-windows.cjs b/apps/desktop/electron-forge/sign-windows.cjs index 23073ade2..ddcf354c4 100644 --- a/apps/desktop/electron-forge/sign-windows.cjs +++ b/apps/desktop/electron-forge/sign-windows.cjs @@ -17,8 +17,14 @@ module.exports = function (filePath) { } const command = `${WINDOWS_SIGN_EXECUTABLE} --executable "${filePath}"`; - console.log(`[Sign] ${command}`); + console.log(`[Sign] Running ${command}`); - const output = child_process.execSync(command); - console.log(`[Sign] ${output}`); + try { + child_process.execSync(command); + } catch (e) { + console.warn(`[Sign] Unable to sign ${filePath} due to:\n${e.stdout.toString("utf-8")})}`) + return; + } + + console.log(`[Sign] Signed ${filePath} successfully.`); } \ No newline at end of file From d91fd0f2d0a5801e31219547090fbf467179bc9d Mon Sep 17 00:00:00 2001 From: Elian Doran Date: Wed, 14 May 2025 13:03:48 +0300 Subject: [PATCH 6/6] chore(signing): disable debug --- apps/desktop/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 7363da732..578c0f816 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -101,13 +101,13 @@ "dependsOn": [ "build" ], - "command": "pnpm -C apps/desktop exec cross-env DEBUG=* NODE_INSTALLER=npm electron-forge make dist" + "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge make dist" }, "electron-forge:package": { "dependsOn": [ "build" ], - "command": "pnpm -C apps/desktop exec cross-env DEBUG=* NODE_INSTALLER=npm electron-forge package dist" + "command": "pnpm -C apps/desktop exec cross-env NODE_INSTALLER=npm electron-forge package dist" } } }