From 57fda9b2702566d5e72439151da0a0f58aee33c9 Mon Sep 17 00:00:00 2001 From: Mike Maietta Date: Sat, 18 Nov 2023 11:37:51 -0800 Subject: [PATCH] Pass buildOptions down to notarization to explicitly pull build options --- packages/app-builder-lib/src/macPackager.ts | 10 +++++----- packages/app-builder-lib/src/targets/FlatpakTarget.ts | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/app-builder-lib/src/macPackager.ts b/packages/app-builder-lib/src/macPackager.ts index 2e5572a062e..bc57f1bcc3d 100644 --- a/packages/app-builder-lib/src/macPackager.ts +++ b/packages/app-builder-lib/src/macPackager.ts @@ -332,7 +332,7 @@ export default class MacPackager extends PlatformPackager { } if (!isMas) { - await this.notarizeIfProvided(appPath) + await this.notarizeIfProvided(appPath, options) } return true } @@ -481,10 +481,10 @@ export default class MacPackager extends PlatformPackager { return true } - private async notarizeIfProvided(appPath: string) { - const notarizeOptions = this.platformSpecificBuildOptions.notarize - if (notarizeOptions === false) { - log.info({ reason: "`notarizeOptions` is explicitly set to false" }, "skipped macOS notarization") + private async notarizeIfProvided(appPath: string, buildOptions: MacConfiguration) { + const notarizeOptions = buildOptions.notarize + if (!notarizeOptions) { + log.info({ reason: "`notarize` options were not provided" }, "skipped macOS notarization") return } const appleId = process.env.APPLE_ID diff --git a/packages/app-builder-lib/src/targets/FlatpakTarget.ts b/packages/app-builder-lib/src/targets/FlatpakTarget.ts index f91e3239d9e..24e28542ae9 100644 --- a/packages/app-builder-lib/src/targets/FlatpakTarget.ts +++ b/packages/app-builder-lib/src/targets/FlatpakTarget.ts @@ -84,7 +84,7 @@ export default class FlatpakTarget extends Target { const copyIcons = icons.map(async icon => { if (icon.size > 512) { // Flatpak does not allow icons larger than 512 pixels - return Promise.resolve(); + return Promise.resolve() } const extWithDot = path.extname(icon.file) const sizeName = extWithDot === ".svg" ? "scalable" : `${icon.size}x${icon.size}`