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

fix: S3 urls on mac #1386

Closed
wants to merge 1 commit into from
Closed

fix: S3 urls on mac #1386

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/electron-builder/src/publish/PublishManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ async function writeUpdateInfo(event: ArtifactCreated, _publishConfigs: Array<Pu
await (<any>outputJson)(updateInfoFile, <VersionInfo>{
version: version,
releaseDate: new Date().toISOString(),
url: computeDownloadUrl(publishConfig, packager.generateName2("zip", "mac", isGitHub), packager),
url: await computeDownloadUrl(publishConfig, packager.generateName2("zip", "mac", isGitHub), packager),
}, {spaces: 2})

packager.info.dispatchArtifactCreated({
Expand Down Expand Up @@ -326,7 +326,7 @@ function requireProviderClass(provider: string): any | null {
}
}

export function computeDownloadUrl(publishConfig: PublishConfiguration, fileName: string | null, packager: PlatformPackager<any>) {
export async function computeDownloadUrl(publishConfig: PublishConfiguration, fileName: string | null, packager: PlatformPackager<any>) {
if (publishConfig.provider === "generic") {
const baseUrlString = (<GenericServerOptions>publishConfig).url
if (fileName == null) {
Expand All @@ -339,6 +339,10 @@ export function computeDownloadUrl(publishConfig: PublishConfiguration, fileName

let baseUrl
if (publishConfig.provider === "s3") {
const providerClass = requireProviderClass(publishConfig.provider)
if (providerClass != null && providerClass.modifyPublishConfig != null) {
publishConfig = await providerClass.modifyPublishConfig(publishConfig)
}
baseUrl = s3Url((<S3Options>publishConfig))
}
else {
Expand Down
2 changes: 1 addition & 1 deletion packages/electron-builder/src/targets/WebInstaller.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export default class WebInstallerTarget extends NsisTarget {
throw new Error("Cannot compute app package download URL")
}

appPackageUrl = computeDownloadUrl(publishConfigs[0], null, packager)
appPackageUrl = await computeDownloadUrl(publishConfigs[0], null, packager)

defines.APP_PACKAGE_URL_IS_INCOMLETE = null
}
Expand Down