fix(deployment): Artifacts being published to S3 when they shouldn't be

Close #2708
electron-userland · Mar 27, 2018 · b72b9e8 · b72b9e8
1 parent cc9f1d6
commit b72b9e8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 2 deletions.
diff --git a/packages/electron-builder-lib/src/publish/PublishManager.ts b/packages/electron-builder-lib/src/publish/PublishManager.ts
@@ -119,6 +119,12 @@ export class PublishManager implements PublishContext {
       return
     }
 
+    const providerName = publisher.providerName
+    if (this.publishOptions.publish === "onTagOrDraft" && getCiTag() == null && !(providerName === "GitHub" || providerName === "Bintray")) {
+      log.info({file: event.file, reason: "current build is not for a git tag", publishPolicy: "onTagOrDraft"}, `not published to ${providerName}`)
+      return
+    }
+
     this.taskManager.addTask(publisher.upload(event))
   }
 

diff --git a/test/src/PublishManagerTest.ts b/test/src/PublishManagerTest.ts
@@ -49,7 +49,7 @@ test.ifDevOrLinuxCi("github and spaces (publishAutoUpdate)", app({
   },
 }))
 
-test.ifDevOrLinuxCi.ifAll("mac artifactName ", app({
+test.ifAll("mac artifactName ", app({
   targets: Platform.MAC.createTarget("zip"),
   config: {
     // tslint:disable-next-line:no-invalid-template-strings
@@ -65,6 +65,8 @@ test.ifDevOrLinuxCi.ifAll("mac artifactName ", app({
       },
     ]
   },
+}, {
+  publish: undefined,
 }))
 
 // otherwise test "os macro" always failed for pull requests

diff --git a/test/src/helpers/packTester.ts b/test/src/helpers/packTester.ts
@@ -162,7 +162,7 @@ export function getFixtureDir() {
 async function packAndCheck(packagerOptions: PackagerOptions, checkOptions: AssertPackOptions) {
   const cancellationToken = new CancellationToken()
   const packager = new Packager(packagerOptions, cancellationToken)
-  const publishManager = new PublishManager(packager, {publish: checkOptions.publish || "never"})
+  const publishManager = new PublishManager(packager, {publish: "publish" in checkOptions ? checkOptions.publish : "never"})
 
   const artifacts: Map<Platform, Array<ArtifactCreated>> = new Map()
   packager.artifactCreated(event => {