fix: windows async signing

electron-userland · Mar 16, 2021 · 9162711 · 9162711 · prcdpr · May 5, 2021
1 parent e6bc232
commit 9162711
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts b/packages/app-builder-lib/src/codeSign/windowsCodeSign.ts
@@ -56,12 +56,14 @@ export async function sign(options: WindowsSignOptions, packager: WinPackager) {
   let isNest = false
   for (const hash of hashes) {
     const taskConfiguration: WindowsSignTaskConfiguration = { ...options, hash, isNest }
-    await executor(
-      {
-        ...taskConfiguration,
-        computeSignToolArgs: isWin => computeSignToolArgs(taskConfiguration, isWin),
-      },
-      packager
+    await Promise.resolve(
+      executor(
+        {
+          ...taskConfiguration,
+          computeSignToolArgs: isWin => computeSignToolArgs(taskConfiguration, isWin),
+        },
+        packager
+      )
     )
     isNest = true
     if (taskConfiguration.resultOutputPath != null) {

diff --git a/test/src/windows/winCodeSignTest.ts b/test/src/windows/winCodeSignTest.ts
@@ -51,6 +51,16 @@ function testCustomSign(sign: any) {
   })
 }
 
+test.ifAll.ifNotCiMac(
+  "certificateFile/password - sign as async/await",
+  testCustomSign(async () => {
+    return
+  })
+)
+test.ifAll.ifNotCiMac(
+  "certificateFile/password - sign as Promise",
+  testCustomSign(() => Promise.resolve())
+)
 test.ifAll.ifNotCiMac("certificateFile/password - sign as function", testCustomSign(require("../helpers/customWindowsSign").default))
 test.ifAll.ifNotCiMac("certificateFile/password - sign as path", testCustomSign(path.join(__dirname, "../helpers/customWindowsSign")))