fix(mac): Exits with status=0 when signing fails

Close #2538

Author: develar

packages/electron-builder-lib/src/codeSign.ts

@@ -141,7 +141,7 @@ async function createCustomCertKeychain() {
   // copy to temp and then atomic rename to final path
   const tmpKeychainPath = path.join(getCacheDirectory(), getTempName("electron-builder-root-certs"))
   const keychainPath = path.join(getCacheDirectory(), "electron-builder-root-certs.keychain")
-  const results = await BluebirdPromise.all<any>([
+  const results = await Promise.all<any>([
     listUserKeychains(),
     copyFile(path.join(__dirname, "..", "certs", "root_certs.keychain"), tmpKeychainPath)
       .then(() => rename(tmpKeychainPath, keychainPath)),
@@ -210,7 +210,7 @@ export async function createKeychain({tmpDir, cscLink, cscKeyPassword, cscILink,
     securityCommands.push(["list-keychains", "-d", "user", "-s", keychainFile].concat(list))
   }
 
-  await BluebirdPromise.all([
+  await Promise.all([
     // we do not clear downloaded files - will be removed on tmpDir cleanup automatically. not a security issue since in any case data is available as env variables and protected by password.
     BluebirdPromise.map(certLinks, (link, i) => downloadCertificate(link, tmpDir, currentDir).then(it => certPaths[i] = it)),
     BluebirdPromise.mapSeries(securityCommands, it => exec("security", it))

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

@@ -22,26 +22,25 @@ import { createCommonTarget, NoOpTarget } from "./targets/targetFactory"
 import { CONCURRENCY } from "builder-util/out/fs"
 
 export default class MacPackager extends PlatformPackager<MacConfiguration> {
-  readonly codeSigningInfo: Promise<CodeSigningInfo>
+  readonly codeSigningInfo = new Lazy<CodeSigningInfo>(() => {
+    if (this.packagerOptions.cscLink == null || process.platform !== "darwin") {
+      return Promise.resolve({keychainName: process.env.CSC_KEYCHAIN || null})
+    }
+
+    return createKeychain({
+      tmpDir: this.info.tempDirManager,
+      cscLink: this.packagerOptions.cscLink!,
+      cscKeyPassword: this.getCscPassword(),
+      cscILink: this.packagerOptions.cscInstallerLink,
+      cscIKeyPassword: this.packagerOptions.cscInstallerKeyPassword,
+      currentDir: this.projectDir
+    })
+  })
 
   private _iconPath = new Lazy(() => this.getOrConvertIcon("icns"))
 
   constructor(info: Packager) {
     super(info, Platform.MAC)
-
-    if (this.packagerOptions.cscLink == null || process.platform !== "darwin") {
-      this.codeSigningInfo = BluebirdPromise.resolve({keychainName: process.env.CSC_KEYCHAIN || null})
-    }
-    else {
-      this.codeSigningInfo = createKeychain({
-        tmpDir: info.tempDirManager,
-        cscLink: this.packagerOptions.cscLink!,
-        cscKeyPassword: this.getCscPassword(),
-        cscILink: this.packagerOptions.cscInstallerLink,
-        cscIKeyPassword: this.packagerOptions.cscInstallerKeyPassword,
-        currentDir: this.projectDir
-      })
-    }
   }
 
   get defaultTarget(): Array<string> {
@@ -141,7 +140,7 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
       return
     }
 
-    const keychainName = (await this.codeSigningInfo).keychainName
+    const keychainName = (await this.codeSigningInfo.value).keychainName
     const explicitType = isMas ? masOptions!.type : macOptions.type
     const type = explicitType || "distribution"
     const isDevelopment = type === "development"
@@ -264,7 +263,7 @@ export default class MacPackager extends PlatformPackager<MacConfiguration> {
     await createMacApp(this, appOutDir, asarIntegrity)
 
     const wantedLanguages = asArray(this.platformSpecificBuildOptions.electronLanguages)
-    if (wantedLanguages == null) {
+    if (wantedLanguages.length === 0) {
       return
     }
 

packages/electron-builder-lib/src/targets/dmg.ts

@@ -94,7 +94,7 @@ export class DmgTarget extends Target {
       return
     }
 
-    const keychainName = (await packager.codeSigningInfo).keychainName
+    const keychainName = (await packager.codeSigningInfo.value).keychainName
     const certificateType = "Developer ID Application"
     let identity = await findIdentity(certificateType, qualifier, keychainName)
     if (identity == null) {

packages/electron-builder-lib/src/targets/pkg.ts

@@ -1,4 +1,3 @@
-import BluebirdPromise from "bluebird-lst"
 import { Arch, debug, exec, use } from "builder-util"
 import { statOrNull } from "builder-util/out/fs"
 import { getNotLocalizedLicenseFiles } from "builder-util/out/license"
@@ -38,14 +37,14 @@ export class PkgTarget extends Target {
 
     this.logBuilding("pkg", artifactPath, arch)
 
-    const keychainName = (await packager.codeSigningInfo).keychainName
+    const keychainName = (await packager.codeSigningInfo.value).keychainName
 
     const appOutDir = this.outDir
     // https://developer.apple.com/library/content/documentation/DeveloperTools/Reference/DistributionDefinitionRef/Chapters/Distribution_XML_Ref.html
     const distInfoFile = path.join(appOutDir, "distribution.xml")
 
     const innerPackageFile = path.join(appOutDir, `${filterCFBundleIdentifier(appInfo.id)}.pkg`)
-    const identity = (await BluebirdPromise.all([
+    const identity = (await Promise.all([
       findIdentity(certType, options.identity || packager.platformSpecificBuildOptions.identity, keychainName),
       this.customizeDistributionConfiguration(distInfoFile, appPath),
       this.buildComponentPackage(appPath, innerPackageFile),
@@ -62,7 +61,7 @@ export class PkgTarget extends Target {
     await exec("productbuild", args, {
       cwd: appOutDir,
     })
-    await BluebirdPromise.all([unlink(innerPackageFile), unlink(distInfoFile)])
+    await Promise.all([unlink(innerPackageFile), unlink(distInfoFile)])
 
     packager.dispatchArtifactCreated(artifactPath, this, arch, packager.computeSafeArtifactName(artifactName, "pkg", arch))
   }

test/src/helpers/runTests.ts

@@ -62,11 +62,11 @@ async function runTests() {
       testPatterns.push("mainEntryTest")
       testPatterns.push("PublishManagerTest", "ArtifactPublisherTest", "httpRequestTest", "RepoSlugTest")
       testPatterns.push("macPackagerTest")
-      testPatterns.push("portableTest")
       testPatterns.push("linuxPackagerTest")
       testPatterns.push("ignoreTest")
     }
     else {
+      testPatterns.push("portableTest")
       testPatterns.push("BuildTest")
       testPatterns.push("assistedInstallerTest")
       testPatterns.push("linuxArchiveTest")

test/src/mac/macPackagerTest.ts

@@ -21,7 +21,9 @@ test.ifMac.ifAll("two-package", () => assertPack("test-app", {
 }, {
   signed: true,
   checkMacApp: async appDir => {
-    expect((await readdir(path.join(appDir, "Contents", "Resources"))).filter(it => !it.startsWith("."))).toMatchSnapshot()
+    expect((await readdir(path.join(appDir, "Contents", "Resources")))
+      .filter(it => !it.startsWith("."))
+      .sort()).toMatchSnapshot()
   },
 }))