electron-userland
diff --git a/‎.idea/codeStyleSettings.xml
Lines changed: 1 addition & 0 deletions b/‎.idea/codeStyleSettings.xml
Lines changed: 1 addition & 0 deletions
diff --git a/‎packages/electron-builder/src/publish/PublishManager.ts
Lines changed: 5 additions & 5 deletions b/‎packages/electron-builder/src/publish/PublishManager.ts
Lines changed: 5 additions & 5 deletions
diff --git a/‎test/out/mac/__snapshots__/macPackagerTest.js.snap
Lines changed: 7 additions & 0 deletions b/‎test/out/mac/__snapshots__/macPackagerTest.js.snap
Lines changed: 7 additions & 0 deletions
diff --git a/‎test/src/mac/macPackagerTest.ts
Lines changed: 8 additions & 0 deletions b/‎test/src/mac/macPackagerTest.ts
Lines changed: 8 additions & 0 deletions
diff --git a/‎test/src/nsisUpdaterTest.ts
Lines changed: 1 addition & 1 deletion b/‎test/src/nsisUpdaterTest.ts
Lines changed: 1 addition & 1 deletion
@@ -51,11 +51,11 @@ export class PublishManager {
 
       if (publishOptions.publish != null && publishOptions.publish !== "never") {
         this.isPublish = publishOptions.publish !== "onTag" || getCiTag() != null
-        if (this.isPublish && !isAuthTokenSet()) {
-          throw new Error(`Publish is set to ${publishOptions.publish}, but neither GH_TOKEN nor BT_TOKEN is not set`)
-        }
       }
     }
+    else if (publishOptions.publish !== "never") {
+      log("Current build is a part of pull request, publishing will be skipped")
+    }
 
     packager.addAfterPackHandler(async event => {
       if (!(event.electronPlatformName == "darwin" || event.packager.platform === Platform.WINDOWS)) {
@@ -264,11 +264,11 @@ function isAuthTokenSet() {
 function computeDownloadUrl(publishConfig: PublishConfiguration, fileName: string, version: string) {
   if (publishConfig.provider === "generic") {
     const baseUrl = url.parse((<GenericServerOptions>publishConfig).url)
-    return url.format(Object.assign({}, baseUrl, {pathname: path.posix.resolve(baseUrl.pathname || "/", fileName)}))
+    return url.format(Object.assign({}, baseUrl, {pathname: path.posix.resolve(baseUrl.pathname || "/", encodeURI(fileName))}))
   }
   else {
     const gh = <GithubOptions>publishConfig
-    return `https://github.com${`/${gh.owner}/${gh.repo}/releases`}/download/v${version}/${fileName}`
+    return `https://github.com${`/${gh.owner}/${gh.repo}/releases`}/download/v${version}/${encodeURI(fileName)}`
   }
 }
 
 
@@ -57,6 +57,13 @@ Array [
 ]
 `;
 
+exports[`test one-package 3`] = `
+Object {
+  "url": "https://develar.s3.amazonaws.com/test/Test%20App%20%C3%9FW-1.1.0-mac.zip",
+  "version": "1.1.0",
+}
+`;
+
 exports[`test two-package 1`] = `
 Array [
   Object {
 
@@ -1,5 +1,6 @@
 import { assertPack, platform, app, appThrows } from "../helpers/packTester"
 import { Platform, createTargets } from "electron-builder"
+import { readJson } from "fs-extra-p"
 import { DIR_TARGET } from "electron-builder/out/targets/targetFactory"
 import { copyFile } from "electron-builder-util/out/fs"
 import * as path from "path"
@@ -10,6 +11,10 @@ test.ifMac("two-package", () => assertPack("test-app", {targets: createTargets([
 test.ifMac("one-package", app({
   targets: Platform.MAC.createTarget(),
   config: {
+    publish: {
+      provider: "generic",
+      url: "https://develar.s3.amazonaws.com/test",
+    },
     mac: {
       fileAssociations: [
         {
@@ -33,6 +38,9 @@ test.ifMac("one-package", app({
     expect(info).toMatchSnapshot()
     await assertThat(path.join(appDir, "Contents", "Resources", "foo.icns")).isFile()
   },
+  packed: async context => {
+    expect(await readJson(path.join(context.outDir, "latest-mac.json"))).toMatchSnapshot()
+  },
 }))
 
 test.ifMac("electronDist", appThrows(/ENOENT: no such file or directory/, {
 
@@ -86,7 +86,7 @@ test("file url generic", async () => {
   expect(actualEvents).toMatchSnapshot()
 })
 
-test("sha2 mismatch error event", async () => {
+test.ifNotCiWin("sha2 mismatch error event", async () => {
   const updater = new NsisUpdater()
   updater.updateConfigPath = await writeUpdateConfig(<GenericServerOptions>{
     provider: "generic",
Original file line number	Diff line number	Diff line change
`@@ -51,11 +51,11 @@ export class PublishManager {`
`51`	`51`
`52`	`52`	`if (publishOptions.publish != null && publishOptions.publish !== "never") {`
`53`	`53`	`this.isPublish = publishOptions.publish !== "onTag" \|\| getCiTag() != null`
`54`		`- if (this.isPublish && !isAuthTokenSet()) {`
`55`		- throw new Error(`Publish is set to ${publishOptions.publish}, but neither GH_TOKEN nor BT_TOKEN is not set`)
`56`		`- }`
`57`	`54`	`}`
`58`	`55`	`}`
	`56`	`+ else if (publishOptions.publish !== "never") {`
	`57`	`+ log("Current build is a part of pull request, publishing will be skipped")`
	`58`	`+ }`
`59`	`59`
`60`	`60`	`packager.addAfterPackHandler(async event => {`
`61`	`61`	`if (!(event.electronPlatformName == "darwin" \|\| event.packager.platform === Platform.WINDOWS)) {`
`@@ -264,11 +264,11 @@ function isAuthTokenSet() {`
`264`	`264`	`function computeDownloadUrl(publishConfig: PublishConfiguration, fileName: string, version: string) {`
`265`	`265`	`if (publishConfig.provider === "generic") {`
`266`	`266`	`const baseUrl = url.parse((<GenericServerOptions>publishConfig).url)`
`267`		`- return url.format(Object.assign({}, baseUrl, {pathname: path.posix.resolve(baseUrl.pathname \|\| "/", fileName)}))`
	`267`	`+ return url.format(Object.assign({}, baseUrl, {pathname: path.posix.resolve(baseUrl.pathname \|\| "/", encodeURI(fileName))}))`
`268`	`268`	`}`
`269`	`269`	`else {`
`270`	`270`	`const gh = <GithubOptions>publishConfig`
`271`		- return `https://github.com${`/${gh.owner}/${gh.repo}/releases`}/download/v${version}/${fileName}`
	`271`	+ return `https://github.com${`/${gh.owner}/${gh.repo}/releases`}/download/v${version}/${encodeURI(fileName)}`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`