| ... | @@ -140,7 +140,7 @@ const BuildEnvConfig = Config.all({ | ... | @@ -140,7 +140,7 @@ const BuildEnvConfig = Config.all({ |
| 140 | | 140 | |
| 141 | const resolveBooleanFlag = (flag: Option.Option<boolean>, envValue: boolean) => | 141 | const resolveBooleanFlag = (flag: Option.Option<boolean>, envValue: boolean) => |
| 142 | Option.getOrElse(Option.filter(flag, Boolean), () => envValue); | 142 | Option.getOrElse(Option.filter(flag, Boolean), () => envValue); |
| 143 | const mergeOptions = <A,>(a: Option.Option<A>, b: Option.Option<A>, defaultValue: A) => | 143 | const mergeOptions = <A>(a: Option.Option<A>, b: Option.Option<A>, defaultValue: A) => |
| 144 | Option.getOrElse(a, () => Option.getOrElse(b, () => defaultValue)); | 144 | Option.getOrElse(a, () => Option.getOrElse(b, () => defaultValue)); |
| 145 | | 145 | |
| 146 | const resolveBuildOptions = Effect.fn(function* (input: BuildCliInput) { | 146 | const resolveBuildOptions = Effect.fn(function* (input: BuildCliInput) { |
| ... | @@ -195,7 +195,6 @@ const runCommand = Effect.fn(function* (command: ChildProcess.Command) { | ... | @@ -195,7 +195,6 @@ const runCommand = Effect.fn(function* (command: ChildProcess.Command) { |
| 195 | if (exitCode !== 0) { | 195 | if (exitCode !== 0) { |
| 196 | return yield* new BuildScriptError({ | 196 | return yield* new BuildScriptError({ |
| 197 | message: "Command exited with non-zero exit code", | 197 | message: "Command exited with non-zero exit code", |
| 198 | cause: command, | | |
| 199 | }); | 198 | }); |
| 200 | } | 199 | } |
| 201 | }); | 200 | }); |
| ... | @@ -521,8 +520,18 @@ const buildDesktopArtifact = Effect.fn(function* (options: ResolvedBuildOptions) | ... | @@ -521,8 +520,18 @@ const buildDesktopArtifact = Effect.fn(function* (options: ResolvedBuildOptions) |
| 521 | const buildEnv: NodeJS.ProcessEnv = { | 520 | const buildEnv: NodeJS.ProcessEnv = { |
| 522 | ...process.env, | 521 | ...process.env, |
| 523 | }; | 522 | }; |
| | 523 | for (const [key, value] of Object.entries(buildEnv)) { |
| | 524 | if (value === "") { |
| | 525 | delete buildEnv[key]; |
| | 526 | } |
| | 527 | } |
| 524 | if (!options.signed) { | 528 | if (!options.signed) { |
| 525 | buildEnv.CSC_IDENTITY_AUTO_DISCOVERY = "false"; | 529 | buildEnv.CSC_IDENTITY_AUTO_DISCOVERY = "false"; |
| | 530 | delete buildEnv.CSC_LINK; |
| | 531 | delete buildEnv.CSC_KEY_PASSWORD; |
| | 532 | delete buildEnv.APPLE_API_KEY; |
| | 533 | delete buildEnv.APPLE_API_KEY_ID; |
| | 534 | delete buildEnv.APPLE_API_ISSUER; |
| 526 | } | 535 | } |
| 527 | | 536 | |
| 528 | yield* Effect.log( | 537 | yield* Effect.log( |
| ... | @@ -533,7 +542,7 @@ const buildDesktopArtifact = Effect.fn(function* (options: ResolvedBuildOptions) | ... | @@ -533,7 +542,7 @@ const buildDesktopArtifact = Effect.fn(function* (options: ResolvedBuildOptions) |
| 533 | cwd: stageAppDir, | 542 | cwd: stageAppDir, |
| 534 | env: buildEnv, | 543 | env: buildEnv, |
| 535 | ...commandOutputOptions(options.verbose), | 544 | ...commandOutputOptions(options.verbose), |
| 536 | })`bunx --bun electron-builder ${platformConfig.cliFlag} ${options.target} --${options.arch} --publish never`, | 545 | })`bunx electron-builder ${platformConfig.cliFlag} ${options.target} --${options.arch} --publish never`, |
| 537 | ); | 546 | ); |
| 538 | | 547 | |
| 539 | const stageDistDir = path.join(stageAppDir, "dist"); | 548 | const stageDistDir = path.join(stageAppDir, "dist"); |
Julius Marminge <julius0216@outlook.com> 2026-03-01 18:33:39-08:00
Julius Marminge <jmarminge@gmail.com> 2026-03-01 18:41:36-08:00