From d278f855eb1cef1702602f63f578f59f484050b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C5=91rik=20Levente?= Date: Thu, 29 Aug 2024 14:02:40 +0200 Subject: [PATCH] fix windows sign --- .github/workflows/release-artifacts.yml | 6 +----- core/tauri.conf.json | 4 ++-- package.json | 1 - scripts/sign.js | 12 ------------ 4 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 scripts/sign.js diff --git a/.github/workflows/release-artifacts.yml b/.github/workflows/release-artifacts.yml index 07e0c6d..2c3f730 100644 --- a/.github/workflows/release-artifacts.yml +++ b/.github/workflows/release-artifacts.yml @@ -42,7 +42,7 @@ jobs: - name: Install trusted-signing-cli if: matrix.NAME == 'windows' run: | - cargo install trusted-signing-cli@0.2.0 + cargo install trusted-signing-cli@0.3.0 - name: "Apple silicon target" if: runner.os == 'macOS' @@ -97,10 +97,6 @@ jobs: path: package.json prop_path: version - - name: Sign windows installer - run: | - npm run sign ./core/target/release/upload/authme-${{steps.version.outputs.prop}}-windows-x64.msi - # Windows - name: Upload the windows installer asset if: runner.os == 'Windows' diff --git a/core/tauri.conf.json b/core/tauri.conf.json index 1489103..1775162 100644 --- a/core/tauri.conf.json +++ b/core/tauri.conf.json @@ -2,7 +2,6 @@ "build": { "beforeBuildCommand": "npm run build:bundle", "beforeDevCommand": "npm run server", - "beforeBundleCommand": "npm run sign ./core/target/release/Authme.exe", "devPath": "http://localhost:3000", "distDir": "../dist" }, @@ -45,7 +44,8 @@ "windows": { "certificateThumbprint": null, "digestAlgorithm": "sha256", - "timestampUrl": "" + "timestampUrl": "", + "signCommand": "trusted-signing-cli %1 -e 'https://wus2.codesigning.azure.net' -a mnr -c Profile3" } }, "security": { diff --git a/package.json b/package.json index 3ddd59e..4b145d8 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,6 @@ "setup": "node scripts/buildNumber.cjs alpha false && node scripts/build.js", "rename": "node scripts/rename.js", "check": "svelte-check && tsc --noEmit && eslint .", - "sign": "node scripts/sign.js", "tauri": "tauri" }, "workspaces": [ diff --git a/scripts/sign.js b/scripts/sign.js deleted file mode 100644 index 4a85b0e..0000000 --- a/scripts/sign.js +++ /dev/null @@ -1,12 +0,0 @@ -import { exec } from "child_process" -import { platform } from "os" - -if (platform() === "win32") { - exec(`trusted-signing-cli ${process.argv[2]} -e https://eus.codesigning.azure.net -a mnr -c Profile1`, (error, stdout) => { - if (error) { - return console.error(`Error: ${error}`) - } - - console.log(`Result: ${stdout}`) - }) -} \ No newline at end of file