diff --git a/.github/workflows/desktop-release.yml b/.github/workflows/desktop-release.yml index b751976..122008d 100644 --- a/.github/workflows/desktop-release.yml +++ b/.github/workflows/desktop-release.yml @@ -41,7 +41,7 @@ jobs: steps: - uses: actions/checkout@v5 with: - ref: ${{ env.VERSION }} + ref: ${{ github.ref_name }} - uses: actions/setup-node@v5 with: @@ -162,7 +162,7 @@ jobs: steps: - uses: actions/checkout@v5 with: - ref: ${{ env.VERSION }} + ref: ${{ github.ref_name }} - uses: actions/setup-node@v5 with: diff --git a/apps/desktop/package.json b/apps/desktop/package.json index 56fdb6d..e4b5aca 100644 --- a/apps/desktop/package.json +++ b/apps/desktop/package.json @@ -33,6 +33,7 @@ "build": { "appId": "dev.specdock.app", "productName": "SpecDock", + "executableName": "specdock", "icon": "build/icon.png", "directories": { "output": "release/desktop" diff --git a/apps/desktop/scripts/package.mjs b/apps/desktop/scripts/package.mjs index fd261d4..45b2462 100644 --- a/apps/desktop/scripts/package.mjs +++ b/apps/desktop/scripts/package.mjs @@ -2,7 +2,20 @@ import { spawn } from "node:child_process"; const target = process.argv[2] ?? "--dir"; const npmCommand = process.platform === "win32" ? "npm.cmd" : "npm"; -const builderArgs = target === "--dir" ? ["electron-builder", "--dir"] : ["electron-builder", target]; +const builderArgs = + target === "--dir" + ? ["electron-builder", "--dir", "--publish", "never"] + : ["electron-builder", target, "--publish", "never"]; +const emptySigningEnvNames = [ + "CSC_LINK", + "CSC_NAME", + "CSC_KEY_PASSWORD", + "WIN_CSC_LINK", + "WIN_CSC_KEY_PASSWORD", + "APPLE_API_KEY", + "APPLE_API_KEY_ID", + "APPLE_API_ISSUER" +]; const hasSigningConfig = process.env.CSC_LINK || process.env.CSC_NAME || @@ -21,6 +34,11 @@ function run(command, args, extraEnv = {}) { }; delete env.ELECTRON_RUN_AS_NODE; + for (const name of emptySigningEnvNames) { + if (env[name] === "") { + delete env[name]; + } + } const child = spawn(command, args, { env,