From e6312cb54e5d957289d5c07b506491fcaea9e334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Garc=C3=ADa=20Ortiz?= Date: Fri, 4 Mar 2022 04:31:04 +0100 Subject: [PATCH] fix(win): Include swiftshader in signing directories for windows (#6682) --- .changeset/lucky-mice-smell.md | 5 +++++ packages/app-builder-lib/src/winPackager.ts | 10 ++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 .changeset/lucky-mice-smell.md diff --git a/.changeset/lucky-mice-smell.md b/.changeset/lucky-mice-smell.md new file mode 100644 index 0000000000..7727c07b91 --- /dev/null +++ b/.changeset/lucky-mice-smell.md @@ -0,0 +1,5 @@ +--- +"app-builder-lib": patch +--- + +fix(signing): Include swiftshader in signing directories for windows diff --git a/packages/app-builder-lib/src/winPackager.ts b/packages/app-builder-lib/src/winPackager.ts index 7dbf63c404..677c50dc83 100644 --- a/packages/app-builder-lib/src/winPackager.ts +++ b/packages/app-builder-lib/src/winPackager.ts @@ -392,9 +392,11 @@ export class WinPackager extends PlatformPackager { return } - const outResourcesDir = path.join(packContext.appOutDir, "resources", "app.asar.unpacked") - // noinspection JSUnusedLocalSymbols - const fileToSign = await walk(outResourcesDir, (file, stat) => stat.isDirectory() || file.endsWith(".exe") || (this.isSignDlls() && file.endsWith(".dll"))) - await BluebirdPromise.map(fileToSign, file => this.sign(file), { concurrency: 4 }) + const signPromise = (filepath: string[]) => { + const outDir = path.join(packContext.appOutDir, ...filepath) + return walk(outDir, (file, stat) => stat.isDirectory() || file.endsWith(".exe") || (this.isSignDlls() && file.endsWith(".dll"))) + } + const filesToSign = await Promise.all([signPromise(["resources", "app.asar.unpacked"]), signPromise(["swiftshader"])]) + await BluebirdPromise.map(filesToSign.flat(1), file => this.sign(file), { concurrency: 4 }) } }