Skip to content

Commit 9d1d150

Browse files
authored
fix(mac): Update mac notarize keychain env var to be optional. Fixes: #8015 (#8022)
1 parent 04f5784 commit 9d1d150

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

.changeset/flat-glasses-smell.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"app-builder-lib": patch
3+
---
4+
5+
fix(mac): Update mac notarize keychain env var to be optional

packages/app-builder-lib/src/macPackager.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,13 @@ import { isMacOsHighSierra } from "./util/macosVersion"
2121
import { getTemplatePath } from "./util/pathManager"
2222
import * as fs from "fs/promises"
2323
import { notarize, NotarizeOptions } from "@electron/notarize"
24-
import { LegacyNotarizePasswordCredentials, LegacyNotarizeStartOptions, NotaryToolStartOptions, NotaryToolCredentials } from "@electron/notarize/lib/types"
24+
import {
25+
LegacyNotarizePasswordCredentials,
26+
LegacyNotarizeStartOptions,
27+
NotaryToolStartOptions,
28+
NotaryToolCredentials,
29+
NotaryToolKeychainCredentials,
30+
} from "@electron/notarize/lib/types"
2531

2632
export type CustomMacSignOptions = SignOptions
2733
export type CustomMacSign = (configuration: CustomMacSignOptions, packager: MacPackager) => Promise<void>
@@ -533,8 +539,12 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
533539
// option 3: keychain
534540
const keychain = process.env.APPLE_KEYCHAIN
535541
const keychainProfile = process.env.APPLE_KEYCHAIN_PROFILE
536-
if (keychain && keychainProfile) {
537-
return this.generateNotarizeOptions(appPath, undefined, { keychain, keychainProfile })
542+
if (keychainProfile) {
543+
let args: NotaryToolKeychainCredentials = { keychainProfile }
544+
if (keychain) {
545+
args = { ...args, keychain }
546+
}
547+
return this.generateNotarizeOptions(appPath, undefined, args)
538548
}
539549

540550
// if no credentials provided, skip silently

0 commit comments

Comments
 (0)