From 77558e648cc7ce7e10ff8e7df6e6cdc9b74295a4 Mon Sep 17 00:00:00 2001 From: develar Date: Sat, 25 Mar 2017 16:53:29 +0100 Subject: [PATCH] fix: ${arch} missing from app-update.yml Close #1389 --- .../src/squirrelWindows.ts | 8 ++--- packages/electron-builder/src/macPackager.ts | 2 +- packages/electron-builder/src/packagerApi.ts | 1 + .../electron-builder/src/platformPackager.ts | 6 ++-- .../src/publish/PublishManager.ts | 30 ++++++++++--------- .../src/targets/ArchiveTarget.ts | 2 +- .../src/targets/WebInstaller.ts | 2 +- .../electron-builder/src/targets/appImage.ts | 2 +- packages/electron-builder/src/targets/appx.ts | 2 +- packages/electron-builder/src/targets/dmg.ts | 2 +- packages/electron-builder/src/targets/fpm.ts | 2 +- packages/electron-builder/src/targets/nsis.ts | 6 ++-- packages/electron-builder/src/targets/pkg.ts | 2 +- packages/electron-builder/src/targets/snap.ts | 2 +- test/out/__snapshots__/ExtraBuildTest.js.snap | 5 ++++ test/out/__snapshots__/filesTest.js.snap | 3 ++ test/out/linux/__snapshots__/debTest.js.snap | 2 ++ test/out/linux/__snapshots__/fpmTest.js.snap | 7 +++++ .../__snapshots__/linuxArchiveTest.js.snap | 3 ++ .../__snapshots__/linuxPackagerTest.js.snap | 2 ++ test/out/linux/__snapshots__/snapTest.js.snap | 1 + test/out/mac/__snapshots__/dmgTest.js.snap | 2 ++ .../mac/__snapshots__/macArchiveTest.js.snap | 5 ++++ .../mac/__snapshots__/macPackagerTest.js.snap | 8 ++++- test/out/mac/__snapshots__/masTest.js.snap | 3 ++ .../__snapshots__/installerTest.js.snap | 5 ++++ .../oneClickInstallerTest.js.snap | 15 +++++++++- .../__snapshots__/squirrelWindowsTest.js.snap | 4 +++ 28 files changed, 97 insertions(+), 37 deletions(-) diff --git a/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts b/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts index 9855ced3fbd..3d9f1f2e09a 100644 --- a/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts +++ b/packages/electron-builder-squirrel-windows/src/squirrelWindows.ts @@ -36,15 +36,15 @@ export default class SquirrelWindowsTarget extends Target { await buildInstaller(distOptions, installerOutDir, setupFileName, packager, appOutDir) - packager.dispatchArtifactCreated(path.join(installerOutDir, setupFileName), this, `${appInfo.name}-Setup-${version}${archSuffix}.exe`) + packager.dispatchArtifactCreated(path.join(installerOutDir, setupFileName), this, arch, `${appInfo.name}-Setup-${version}${archSuffix}.exe`) const packagePrefix = `${appInfo.name}-${convertVersion(version)}-` - packager.dispatchArtifactCreated(path.join(installerOutDir, `${packagePrefix}full.nupkg`), this) + packager.dispatchArtifactCreated(path.join(installerOutDir, `${packagePrefix}full.nupkg`), this, arch) if (distOptions.remoteReleases != null) { - packager.dispatchArtifactCreated(path.join(installerOutDir, `${packagePrefix}delta.nupkg`), this) + packager.dispatchArtifactCreated(path.join(installerOutDir, `${packagePrefix}delta.nupkg`), this, arch) } - packager.dispatchArtifactCreated(path.join(installerOutDir, "RELEASES"), this) + packager.dispatchArtifactCreated(path.join(installerOutDir, "RELEASES"), this, arch) } async computeEffectiveDistOptions(): Promise { diff --git a/packages/electron-builder/src/macPackager.ts b/packages/electron-builder/src/macPackager.ts index fda7ca50489..06179ee25d3 100644 --- a/packages/electron-builder/src/macPackager.ts +++ b/packages/electron-builder/src/macPackager.ts @@ -214,7 +214,7 @@ export default class MacPackager extends PlatformPackager { const pkg = path.join(outDir!, this.expandArtifactNamePattern(masOptions, "pkg")) await this.doFlat(appPath, pkg, masInstallerIdentity, keychainName) - this.dispatchArtifactCreated(pkg, null, `${this.appInfo.name}-${this.appInfo.version}.pkg`) + this.dispatchArtifactCreated(pkg, null, Arch.x64, `${this.appInfo.name}-${this.appInfo.version}.pkg`) } } diff --git a/packages/electron-builder/src/packagerApi.ts b/packages/electron-builder/src/packagerApi.ts index 2f5670a9c3c..f23fe093428 100644 --- a/packages/electron-builder/src/packagerApi.ts +++ b/packages/electron-builder/src/packagerApi.ts @@ -76,6 +76,7 @@ export interface BuildInfo { export interface ArtifactCreated { readonly packager: PlatformPackager readonly target: Target | null + readonly arch: Arch | null readonly file?: string readonly data?: Buffer diff --git a/packages/electron-builder/src/platformPackager.ts b/packages/electron-builder/src/platformPackager.ts index 3e895c50562..cbbf692f2d9 100644 --- a/packages/electron-builder/src/platformPackager.ts +++ b/packages/electron-builder/src/platformPackager.ts @@ -89,12 +89,10 @@ export abstract class PlatformPackager return this.info.prepackaged || path.join(outDir, `${this.platform.buildConfigurationKey}${getArchSuffix(arch)}${this.platform === Platform.MAC ? "" : "-unpacked"}`) } - dispatchArtifactCreated(file: string, target: Target | null, safeArtifactName?: string) { + dispatchArtifactCreated(file: string, target: Target | null, arch: Arch | null, safeArtifactName?: string) { this.info.dispatchArtifactCreated({ - file: file, - safeArtifactName: safeArtifactName, + file, safeArtifactName, target, arch, packager: this, - target: target, }) } diff --git a/packages/electron-builder/src/publish/PublishManager.ts b/packages/electron-builder/src/publish/PublishManager.ts index 6af5a3cd0d9..d0fe70a4aad 100644 --- a/packages/electron-builder/src/publish/PublishManager.ts +++ b/packages/electron-builder/src/publish/PublishManager.ts @@ -1,6 +1,6 @@ import BluebirdPromise from "bluebird-lst" import { createHash } from "crypto" -import { Platform, PlatformSpecificBuildOptions, Target } from "electron-builder-core" +import { Arch, Platform, PlatformSpecificBuildOptions, Target } from "electron-builder-core" import { CancellationToken } from "electron-builder-http/out/CancellationToken" import { BintrayOptions, GenericServerOptions, GithubOptions, githubUrl, PublishConfiguration, PublishProvider, S3Options, s3Url, UpdateInfo, VersionInfo } from "electron-builder-http/out/publishOptions" import { asArray, debug, isEmptyOrSpaces, isPullRequest, safeStringifyJson } from "electron-builder-util" @@ -73,7 +73,7 @@ export class PublishManager implements PublishContext { return } - const publishConfigs = await getPublishConfigsForUpdateInfo(packager, await getPublishConfigs(packager, null)) + const publishConfigs = await getPublishConfigsForUpdateInfo(packager, await getPublishConfigs(packager, null, event.arch), event.arch) if (publishConfigs == null || publishConfigs.length === 0) { return } @@ -96,7 +96,7 @@ export class PublishManager implements PublishContext { private async artifactCreated(event: ArtifactCreated) { const packager = event.packager const target = event.target - const publishConfigs = event.publishConfig == null ? await getPublishConfigs(packager, target == null ? null : target.options) : [event.publishConfig] + const publishConfigs = event.publishConfig == null ? await getPublishConfigs(packager, target == null ? null : target.options, event.arch) : [event.publishConfig] const eventFile = event.file if (publishConfigs == null) { @@ -184,7 +184,7 @@ export class PublishManager implements PublishContext { } } -export async function getPublishConfigsForUpdateInfo(packager: PlatformPackager, publishConfigs: Array | null): Promise | null> { +export async function getPublishConfigsForUpdateInfo(packager: PlatformPackager, publishConfigs: Array | null, arch: Arch | null): Promise | null> { if (publishConfigs === null) { return null } @@ -195,7 +195,7 @@ export async function getPublishConfigsForUpdateInfo(packager: PlatformPackager< // default publish config is github, file should be generated regardless of publish state (user can test installer locally or manage the release process manually) const repositoryInfo = await packager.info.repositoryInfo if (repositoryInfo != null && repositoryInfo.type === "github") { - const resolvedPublishConfig = await getResolvedPublishConfig(packager, {provider: repositoryInfo.type}, false) + const resolvedPublishConfig = await getResolvedPublishConfig(packager, {provider: repositoryInfo.type}, arch, false) if (resolvedPublishConfig != null) { return [resolvedPublishConfig] } @@ -206,7 +206,7 @@ export async function getPublishConfigsForUpdateInfo(packager: PlatformPackager< async function writeUpdateInfo(event: ArtifactCreated, _publishConfigs: Array) { const packager = event.packager - const publishConfigs = await getPublishConfigsForUpdateInfo(packager, _publishConfigs) + const publishConfigs = await getPublishConfigsForUpdateInfo(packager, _publishConfigs, event.arch) if (publishConfigs == null || publishConfigs.length === 0) { return } @@ -236,6 +236,7 @@ async function writeUpdateInfo(event: ArtifactCreated, _publishConfigs: Array, targetSpecificOptions: PlatformSpecificBuildOptions | null | undefined): Promise | null> { +export async function getPublishConfigs(packager: PlatformPackager, targetSpecificOptions: PlatformSpecificBuildOptions | null | undefined, arch: Arch | null): Promise | null> { let publishers // check build.nsis (target) @@ -385,7 +388,7 @@ export async function getPublishConfigs(packager: PlatformPackager, targetS if (serviceName != null) { debug(`Detect ${serviceName} as publish provider`) - return [(await getResolvedPublishConfig(packager, {provider: serviceName}))!] + return [(await getResolvedPublishConfig(packager, {provider: serviceName}, arch))!] } } @@ -394,7 +397,7 @@ export async function getPublishConfigs(packager: PlatformPackager, targetS } debug(`Explicit publish provider: ${safeStringifyJson(publishers)}`) - return await (>>BluebirdPromise.map(asArray(publishers), it => getResolvedPublishConfig(packager, typeof it === "string" ? {provider: it} : it))) + return await (>>BluebirdPromise.map(asArray(publishers), it => getResolvedPublishConfig(packager, typeof it === "string" ? {provider: it} : it, arch))) } function sha256(file: string) { @@ -423,22 +426,21 @@ function getCiTag() { return tag != null && tag.length > 0 ? tag : null } -function expandPublishConfig(options: any, packager: PlatformPackager): void { +function expandPublishConfig(options: any, packager: PlatformPackager, arch: Arch | null): void { for (const name of Object.keys(options)) { const value = options[name] if (typeof value === "string") { - const expanded = packager.expandMacro(value, null) + const expanded = packager.expandMacro(value, arch) if (expanded !== value) { options[name] = expanded } } } } - -async function getResolvedPublishConfig(packager: PlatformPackager, options: PublishConfiguration, errorIfCannot: boolean = true): Promise { +async function getResolvedPublishConfig(packager: PlatformPackager, options: PublishConfiguration, arch: Arch | null, errorIfCannot: boolean = true): Promise { options = Object.assign(Object.create(null), options) - expandPublishConfig(options, packager) + expandPublishConfig(options, packager, arch) const provider = options.provider if (provider === "generic") { diff --git a/packages/electron-builder/src/targets/ArchiveTarget.ts b/packages/electron-builder/src/targets/ArchiveTarget.ts index 05b4cb876e7..cda9f027be8 100644 --- a/packages/electron-builder/src/targets/ArchiveTarget.ts +++ b/packages/electron-builder/src/targets/ArchiveTarget.ts @@ -40,6 +40,6 @@ export class ArchiveTarget extends Target { await archive(packager.config.compression, format, outFile, appOutDir) } - packager.dispatchArtifactCreated(outFile, this, isMac ? packager.generateName2(format, "mac", true) : packager.generateName(format, arch, true, packager.platform === Platform.WINDOWS ? "win" : null)) + packager.dispatchArtifactCreated(outFile, this, Arch.x64, isMac ? packager.generateName2(format, "mac", true) : packager.generateName(format, arch, true, packager.platform === Platform.WINDOWS ? "win" : null)) } } \ No newline at end of file diff --git a/packages/electron-builder/src/targets/WebInstaller.ts b/packages/electron-builder/src/targets/WebInstaller.ts index a8ffaf62347..0727e015f37 100644 --- a/packages/electron-builder/src/targets/WebInstaller.ts +++ b/packages/electron-builder/src/targets/WebInstaller.ts @@ -21,7 +21,7 @@ export default class WebInstallerTarget extends NsisTarget { let appPackageUrl = (options).appPackageUrl if (appPackageUrl == null) { - const publishConfigs = await getPublishConfigsForUpdateInfo(packager, await getPublishConfigs(packager, this.options)) + const publishConfigs = await getPublishConfigsForUpdateInfo(packager, await getPublishConfigs(packager, this.options, null), null) if (publishConfigs == null || publishConfigs.length === 0) { throw new Error("Cannot compute app package download URL") } diff --git a/packages/electron-builder/src/targets/appImage.ts b/packages/electron-builder/src/targets/appImage.ts index f2c23eabd2c..4aa1808a231 100644 --- a/packages/electron-builder/src/targets/appImage.ts +++ b/packages/electron-builder/src/targets/appImage.ts @@ -100,6 +100,6 @@ export default class AppImageTarget extends Target { await chmod(resultFile, "0755") - packager.dispatchArtifactCreated(resultFile, this) + packager.dispatchArtifactCreated(resultFile, this, arch) } } \ No newline at end of file diff --git a/packages/electron-builder/src/targets/appx.ts b/packages/electron-builder/src/targets/appx.ts index 138dec90723..b836eaa62b5 100644 --- a/packages/electron-builder/src/targets/appx.ts +++ b/packages/electron-builder/src/targets/appx.ts @@ -71,7 +71,7 @@ export default class AppXTarget extends Target { await spawn(path.join(vendorPath, "windows-10", arch === Arch.ia32 ? "ia32" : "x64", "makeappx.exe"), args) await packager.sign(destination) - packager.dispatchArtifactCreated(destination, this, packager.generateName("appx", arch, true)) + packager.dispatchArtifactCreated(destination, this, arch, packager.generateName("appx", arch, true)) } private async writeManifest(templatePath: string, preAppx: string, safeName: string, arch: Arch, publisher: string) { diff --git a/packages/electron-builder/src/targets/dmg.ts b/packages/electron-builder/src/targets/dmg.ts index d73dedc0248..c7dc001293f 100644 --- a/packages/electron-builder/src/targets/dmg.ts +++ b/packages/electron-builder/src/targets/dmg.ts @@ -171,7 +171,7 @@ export class DmgTarget extends Target { await spawn("hdiutil", addVerboseIfNeed(["convert", tempDmg, "-ov", "-format", specification.format!, "-imagekey", `zlib-level=${process.env.ELECTRON_BUILDER_COMPRESSION_LEVEL || "9"}`, "-o", artifactPath])) await exec("hdiutil", addVerboseIfNeed(["internet-enable", "-no"]).concat(artifactPath)) - this.packager.dispatchArtifactCreated(artifactPath, this, `${appInfo.name}-${appInfo.version}.dmg`) + this.packager.dispatchArtifactCreated(artifactPath, this, arch, `${appInfo.name}-${appInfo.version}.dmg`) } computeVolumeName(custom?: string | null): string { diff --git a/packages/electron-builder/src/targets/fpm.ts b/packages/electron-builder/src/targets/fpm.ts index 164dc121669..86f26371284 100644 --- a/packages/electron-builder/src/targets/fpm.ts +++ b/packages/electron-builder/src/targets/fpm.ts @@ -174,7 +174,7 @@ export default class FpmTarget extends Target { await exec(await fpmPath, args) - this.packager.dispatchArtifactCreated(destination, this) + this.packager.dispatchArtifactCreated(destination, this, arch) } } diff --git a/packages/electron-builder/src/targets/nsis.ts b/packages/electron-builder/src/targets/nsis.ts index a37fb1b2832..10b95bd996b 100644 --- a/packages/electron-builder/src/targets/nsis.ts +++ b/packages/electron-builder/src/targets/nsis.ts @@ -42,8 +42,6 @@ export default class NsisTarget extends Target { warn('"electron-squirrel-startup" dependency is not required for NSIS') } } - - async build(appOutDir: string, arch: Arch) { this.archs.set(arch, appOutDir) @@ -142,7 +140,7 @@ export default class NsisTarget extends Target { defines[(arch === Arch.x64 ? "APP_64" : "APP_32") + "_NAME"] = path.basename(file) if (this.isWebInstaller) { - packager.dispatchArtifactCreated(file, this) + packager.dispatchArtifactCreated(file, this, arch) } else { filesToDelete.push(file) @@ -176,7 +174,7 @@ export default class NsisTarget extends Target { await this.executeMakensis(defines, commands, await this.computeFinalScript(script, true)) await packager.sign(installerPath) - packager.dispatchArtifactCreated(installerPath, this, this.generateGitHubInstallerName()) + packager.dispatchArtifactCreated(installerPath, this, this.archs.size === 1 ? this.archs.keys().next().value : null, this.generateGitHubInstallerName()) } protected generateGitHubInstallerName() { diff --git a/packages/electron-builder/src/targets/pkg.ts b/packages/electron-builder/src/targets/pkg.ts index 5bfbdc81822..7aee967e18b 100644 --- a/packages/electron-builder/src/targets/pkg.ts +++ b/packages/electron-builder/src/targets/pkg.ts @@ -54,7 +54,7 @@ export class PkgTarget extends Target { }) await BluebirdPromise.all([unlink(innerPackageFile), unlink(distInfo)]) - packager.dispatchArtifactCreated(outFile, this, `${appInfo.name}-${appInfo.version}.pkg`) + packager.dispatchArtifactCreated(outFile, this, arch, `${appInfo.name}-${appInfo.version}.pkg`) } private async buildComponentPackage(appPath: string, outFile: string) { diff --git a/packages/electron-builder/src/targets/snap.ts b/packages/electron-builder/src/targets/snap.ts index 0c24ffd1817..c2dac293a46 100644 --- a/packages/electron-builder/src/targets/snap.ts +++ b/packages/electron-builder/src/targets/snap.ts @@ -126,6 +126,6 @@ export default class SnapTarget extends Target { stdio: ["ignore", "inherit", "pipe"], }) } - packager.dispatchArtifactCreated(resultFile, this) + packager.dispatchArtifactCreated(resultFile, this, arch) } } \ No newline at end of file diff --git a/test/out/__snapshots__/ExtraBuildTest.js.snap b/test/out/__snapshots__/ExtraBuildTest.js.snap index f43789385b3..69096450c53 100644 --- a/test/out/__snapshots__/ExtraBuildTest.js.snap +++ b/test/out/__snapshots__/ExtraBuildTest.js.snap @@ -4,6 +4,7 @@ exports[`custom buildResources and output dirs: linux 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0-x86_64.AppImage", }, ], @@ -20,6 +21,7 @@ exports[`custom buildResources and output dirs: win 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -31,6 +33,7 @@ exports[`override targets in the config - only arch 1`] = ` Object { "win": Array [ Object { + "arch": 0, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -123,9 +126,11 @@ exports[`scheme validation extraFiles 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0-x86_64.AppImage", }, Object { + "arch": 1, "file": "TestApp-1.1.0-ia32.zip", "safeArtifactName": "TestApp-1.1.0-ia32.zip", }, diff --git a/test/out/__snapshots__/filesTest.js.snap b/test/out/__snapshots__/filesTest.js.snap index 1abe527cdd1..643731b6ba1 100644 --- a/test/out/__snapshots__/filesTest.js.snap +++ b/test/out/__snapshots__/filesTest.js.snap @@ -18,13 +18,16 @@ exports[`extraResources on Linux and Windows 2`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "RELEASES", }, Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, Object { + "arch": 1, "file": "TestApp-1.1.0-full.nupkg", }, ], diff --git a/test/out/linux/__snapshots__/debTest.js.snap b/test/out/linux/__snapshots__/debTest.js.snap index b488d325fcf..8156e936867 100644 --- a/test/out/linux/__snapshots__/debTest.js.snap +++ b/test/out/linux/__snapshots__/debTest.js.snap @@ -4,6 +4,7 @@ exports[`arm deb 1`] = ` Object { "linux": Array [ Object { + "arch": 2, "file": "TestApp_1.1.0_armv7l.deb", }, ], @@ -26,6 +27,7 @@ exports[`deb 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp_1.1.0_amd64.deb", }, ], diff --git a/test/out/linux/__snapshots__/fpmTest.js.snap b/test/out/linux/__snapshots__/fpmTest.js.snap index 1b3a5473d9e..55c3a7a95f1 100644 --- a/test/out/linux/__snapshots__/fpmTest.js.snap +++ b/test/out/linux/__snapshots__/fpmTest.js.snap @@ -4,9 +4,11 @@ exports[`rpm and tar.gz 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0.rpm", }, Object { + "arch": 1, "file": "TestApp-1.1.0.tar.gz", "safeArtifactName": "TestApp-1.1.0.tar.gz", }, @@ -18,19 +20,24 @@ exports[`targets 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0.7z", "safeArtifactName": "TestApp-1.1.0.7z", }, Object { + "arch": 1, "file": "TestApp-1.1.0.freebsd", }, Object { + "arch": 1, "file": "TestApp-1.1.0.pacman", }, Object { + "arch": 1, "file": "TestApp-1.1.0.sh", }, Object { + "arch": 1, "file": "TestApp-1.1.0.zip", "safeArtifactName": "TestApp-1.1.0.zip", }, diff --git a/test/out/linux/__snapshots__/linuxArchiveTest.js.snap b/test/out/linux/__snapshots__/linuxArchiveTest.js.snap index a99e46e0407..30a84862413 100644 --- a/test/out/linux/__snapshots__/linuxArchiveTest.js.snap +++ b/test/out/linux/__snapshots__/linuxArchiveTest.js.snap @@ -4,14 +4,17 @@ exports[`tar 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0.tar.bz2", "safeArtifactName": "TestApp-1.1.0.tar.bz2", }, Object { + "arch": 1, "file": "TestApp-1.1.0.tar.lz", "safeArtifactName": "TestApp-1.1.0.tar.lz", }, Object { + "arch": 1, "file": "TestApp-1.1.0.tar.xz", "safeArtifactName": "TestApp-1.1.0.tar.xz", }, diff --git a/test/out/linux/__snapshots__/linuxPackagerTest.js.snap b/test/out/linux/__snapshots__/linuxPackagerTest.js.snap index 851864c36ae..0012ba4e5ee 100644 --- a/test/out/linux/__snapshots__/linuxPackagerTest.js.snap +++ b/test/out/linux/__snapshots__/linuxPackagerTest.js.snap @@ -17,6 +17,7 @@ exports[`AppImage 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0-x86_64.AppImage", }, ], @@ -27,6 +28,7 @@ exports[`icons from ICNS 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0-x86_64.AppImage", }, ], diff --git a/test/out/linux/__snapshots__/snapTest.js.snap b/test/out/linux/__snapshots__/snapTest.js.snap index bcd0f7cf328..8b3a1f6d97b 100644 --- a/test/out/linux/__snapshots__/snapTest.js.snap +++ b/test/out/linux/__snapshots__/snapTest.js.snap @@ -259,6 +259,7 @@ exports[`snap 1`] = ` Object { "linux": Array [ Object { + "arch": 1, "file": "sep_1.1.0_amd64.snap", }, ], diff --git a/test/out/mac/__snapshots__/dmgTest.js.snap b/test/out/mac/__snapshots__/dmgTest.js.snap index a1f171e4702..3322aa9cf3f 100644 --- a/test/out/mac/__snapshots__/dmgTest.js.snap +++ b/test/out/mac/__snapshots__/dmgTest.js.snap @@ -19,6 +19,7 @@ exports[`no background 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "NoBackground-1.1.0.dmg", "safeArtifactName": "TestApp-1.1.0.dmg", }, @@ -32,6 +33,7 @@ exports[`unset dmg icon 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "Test ß No Volume Icon-1.1.0.dmg", "safeArtifactName": "TestApp-1.1.0.dmg", }, diff --git a/test/out/mac/__snapshots__/macArchiveTest.js.snap b/test/out/mac/__snapshots__/macArchiveTest.js.snap index db7ffb1ecd6..11b0de52384 100644 --- a/test/out/mac/__snapshots__/macArchiveTest.js.snap +++ b/test/out/mac/__snapshots__/macArchiveTest.js.snap @@ -137,9 +137,11 @@ exports[`only zip 1`] = ` Object { "mac": Array [ Object { + "arch": null, "file": "latest-mac.json", }, Object { + "arch": 1, "file": "Test App ßW-1.1.0-mac.zip", "safeArtifactName": "TestApp-1.1.0-mac.zip", }, @@ -151,6 +153,7 @@ exports[`pkg 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "Test App ßW-1.1.0.pkg", "safeArtifactName": "TestApp-1.1.0.pkg", }, @@ -162,6 +165,7 @@ exports[`pkg scripts 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "Test App ßW-1.1.0.pkg", "safeArtifactName": "TestApp-1.1.0.pkg", }, @@ -563,6 +567,7 @@ exports[`tar.gz 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "Test App ßW-1.1.0-mac.tar.gz", "safeArtifactName": "TestApp-1.1.0-mac.tar.gz", }, diff --git a/test/out/mac/__snapshots__/macPackagerTest.js.snap b/test/out/mac/__snapshots__/macPackagerTest.js.snap index f9c8c8b45de..2b7eb6d1d8c 100644 --- a/test/out/mac/__snapshots__/macPackagerTest.js.snap +++ b/test/out/mac/__snapshots__/macPackagerTest.js.snap @@ -6,13 +6,16 @@ exports[`one-package 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "Test App ßW-1.1.0.dmg", "safeArtifactName": "TestApp-1.1.0.dmg", }, Object { + "arch": null, "file": "latest-mac.json", }, Object { + "arch": 1, "file": "Test App ßW-1.1.0-mac.zip", "safeArtifactName": "TestApp-1.1.0-mac.zip", }, @@ -75,7 +78,7 @@ Object { exports[`one-package 3`] = ` Object { "releaseDate": "1970-01-01T00:00:00.000Z", - "url": "https://develar.s3.amazonaws.com/test/mac/Test%20App%20%C3%9FW-1.1.0-mac.zip", + "url": "https://develar.s3.amazonaws.com/test/mac/x64/Test%20App%20%C3%9FW-1.1.0-mac.zip", "version": "1.1.0", } `; @@ -84,13 +87,16 @@ exports[`two-package 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "TestApp-1.1.0.dmg", "safeArtifactName": "TestApp-1.1.0.dmg", }, Object { + "arch": null, "file": "latest-mac.json", }, Object { + "arch": 1, "file": "TestApp-1.1.0-mac.zip", "safeArtifactName": "TestApp-1.1.0-mac.zip", }, diff --git a/test/out/mac/__snapshots__/masTest.js.snap b/test/out/mac/__snapshots__/masTest.js.snap index 6f5e6b8b47d..ae8060cf92f 100644 --- a/test/out/mac/__snapshots__/masTest.js.snap +++ b/test/out/mac/__snapshots__/masTest.js.snap @@ -4,6 +4,7 @@ exports[`mas 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "Test App ßW-1.1.0.pkg", "safeArtifactName": "TestApp-1.1.0.pkg", }, @@ -15,10 +16,12 @@ exports[`mas and 7z 1`] = ` Object { "mac": Array [ Object { + "arch": 1, "file": "Test App ßW-1.1.0-mac.7z", "safeArtifactName": "TestApp-1.1.0-mac.7z", }, Object { + "arch": 1, "file": "Test App ßW-1.1.0.pkg", "safeArtifactName": "TestApp-1.1.0.pkg", }, diff --git a/test/out/windows/__snapshots__/installerTest.js.snap b/test/out/windows/__snapshots__/installerTest.js.snap index 321085d4e6f..8ad0ee303de 100644 --- a/test/out/windows/__snapshots__/installerTest.js.snap +++ b/test/out/windows/__snapshots__/installerTest.js.snap @@ -4,6 +4,7 @@ exports[`allowToChangeInstallationDirectory 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test Custom Installation Dir Setup 1.1.0.exe", "safeArtifactName": "test-custom-inst-dir-setup-1.1.0.exe", }, @@ -31,6 +32,7 @@ exports[`boring 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -42,6 +44,7 @@ exports[`boring, only perMachine 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -53,6 +56,7 @@ exports[`portable - artifactName 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßWPortable.1.1.0.exe", "safeArtifactName": "TestApp-1.1.0.exe", }, @@ -64,6 +68,7 @@ exports[`portable 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßW 1.1.0.exe", "safeArtifactName": "TestApp-1.1.0.exe", }, diff --git a/test/out/windows/__snapshots__/oneClickInstallerTest.js.snap b/test/out/windows/__snapshots__/oneClickInstallerTest.js.snap index d1729e84f80..db0c27b3437 100644 --- a/test/out/windows/__snapshots__/oneClickInstallerTest.js.snap +++ b/test/out/windows/__snapshots__/oneClickInstallerTest.js.snap @@ -4,6 +4,7 @@ exports[`custom include 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -15,6 +16,7 @@ exports[`custom script 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -28,6 +30,7 @@ exports[`menuCategory 1`] = ` Object { "win": Array [ Object { + "arch": 0, "file": "Test Menu Category CustomName 1.1.0.exe", "safeArtifactName": "test-menu-category-setup-1.1.0.exe", }, @@ -39,6 +42,7 @@ exports[`multi language license 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -50,6 +54,7 @@ exports[`one-click 1`] = ` Object { "win": Array [ Object { + "arch": 0, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -69,9 +74,11 @@ exports[`perMachine, no run after finish 1`] = ` Object { "win": Array [ Object { + "arch": null, "file": "latest.yml", }, Object { + "arch": 0, "file": "TestApp Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, @@ -82,7 +89,7 @@ Object { exports[`perMachine, no run after finish 2`] = ` Object { "provider": "generic", - "url": "https://develar.s3.amazonaws.com/test/win", + "url": "https://develar.s3.amazonaws.com/test/win/ia32", } `; @@ -98,13 +105,16 @@ exports[`web installer (default github) 1`] = ` Object { "win": Array [ Object { + "arch": null, "file": "Test App ßW Web Setup 1.1.0.exe", "safeArtifactName": "TestApp-WebSetup-1.1.0.exe", }, Object { + "arch": 0, "file": "TestApp-1.1.0-ia32.nsis.7z", }, Object { + "arch": 1, "file": "TestApp-1.1.0-x64.nsis.7z", }, ], @@ -123,13 +133,16 @@ exports[`web installer 1`] = ` Object { "win": Array [ Object { + "arch": null, "file": "latest.yml", }, Object { + "arch": 1, "file": "Test App ßW Web Setup 1.1.0.exe", "safeArtifactName": "TestApp-WebSetup-1.1.0.exe", }, Object { + "arch": 1, "file": "TestApp-1.1.0-x64.nsis.7z", }, ], diff --git a/test/out/windows/__snapshots__/squirrelWindowsTest.js.snap b/test/out/windows/__snapshots__/squirrelWindowsTest.js.snap index 9484704a796..1cf86ae366c 100644 --- a/test/out/windows/__snapshots__/squirrelWindowsTest.js.snap +++ b/test/out/windows/__snapshots__/squirrelWindowsTest.js.snap @@ -4,16 +4,20 @@ exports[`Squirrel.Windows 1`] = ` Object { "win": Array [ Object { + "arch": 1, "file": "RELEASES", }, Object { + "arch": 1, "file": "Test App ßW Setup 1.1.0.exe", "safeArtifactName": "TestApp-Setup-1.1.0.exe", }, Object { + "arch": 1, "file": "TestApp-1.1.0-full.nupkg", }, Object { + "arch": 1, "file": "Test App ßW-1.1.0-win.zip", "safeArtifactName": "TestApp-1.1.0-win.zip", },