Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Issue 5857 ${arch} causes a build fail #5905

Merged
merged 4 commits into from
May 20, 2021
Merged

Issue 5857 ${arch} causes a build fail #5905

Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
daf4a4f
Fix for Issue #5857
vespasianvs May 18, 2021
44128f7
Will always be a duplicate - so no need to check!
vespasianvs May 18, 2021
145d685
My original fix undid the individual builds when ${arch} is included
vespasianvs May 18, 2021
49b2446
add await back in
vespasianvs May 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 9 additions & 6 deletions packages/app-builder-lib/src/targets/nsis/NsisTarget.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,15 @@ export class NsisTarget extends Target {

async finishBuild(): Promise<any> {
try {
const { pattern } = this.packager.artifactPatternConfig(this.options, this.installerFilenamePattern)
const builds = new Set([this.archs])
if (pattern.includes("${arch}")) {
;[...this.archs].forEach(([arch, appOutDir]) => builds.add(new Map<Arch, string>().set(arch, appOutDir)))
const { pattern } = this.packager.artifactPatternConfig(this.options, this.installerFilenamePattern);
const builds = new Set([this.archs]);
if (pattern.includes("${arch}") && this.archs.size > 1) {
;[...this.archs].forEach(([arch, appOutDir]) => builds.add(new Map().set(arch, appOutDir)));
}
const doBuildArchs = builds.values();
for (let archs of doBuildArchs) {
await this.buildInstaller(archs);
}
await Promise.all([...builds].map(archs => this.buildInstaller(archs)))
} finally {
await this.packageHelper.finishBuild()
}
Expand Down Expand Up @@ -357,7 +360,7 @@ export class NsisTarget extends Target {
// http://forums.winamp.com/showthread.php?p=3078545
if (isMacOsCatalina()) {
try {
await UninstallerReader.exec(installerPath, uninstallerPath)
UninstallerReader.exec(installerPath, uninstallerPath)
mmaietta marked this conversation as resolved.
Show resolved Hide resolved
} catch (error) {
log.warn(`packager.vm is used: ${error.message}`)

Expand Down