From ad9e01393d24345c0db8aeb6b7ceb8db3fee90e2 Mon Sep 17 00:00:00 2001
From: Samuel Attard <samuel.r.attard@gmail.com>
Date: Sat, 29 Sep 2018 12:33:56 +1000
Subject: [PATCH] chore: actually publish from circleci and always build node
 headers on vsts

---
 .circleci/config.yml | 18 ++++++++++++++++++
 vsts.yml             |  1 -
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 701f6b169e..d39d412b6c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -179,6 +179,21 @@ step-nodejs-headers-build: &step-nodejs-headers-build
       cd src
       ninja -C out/Default third_party/electron_node:headers
 
+step-electron-publish: &step-electron-publish
+  run:
+    name: Publish Electron Dist
+    command: |
+      cd src/electron
+      if [ "$ELECTRON_RELEASE" == "1" ]; then
+        if [ "$UPLOAD_TO_S3" != "1" ]; then
+          echo 'Uploading Electron release distribution to github releases'
+          script/upload.py
+        else
+          echo 'Uploading Electron release distribution to s3'
+          script/upload.py --upload_to_s3
+        fi
+      fi
+
 step-persist-data-for-tests: &step-persist-data-for-tests
   persist_to_workspace:
     root: .
@@ -411,6 +426,9 @@ steps-electron-build-for-publish: &steps-electron-build-for-publish
     # Node.js headers
     - *step-nodejs-headers-build
 
+    # Publish
+    - *step-electron-publish
+
 
 steps-native-mksnapshot-build: &steps-native-mksnapshot-build
   steps:
diff --git a/vsts.yml b/vsts.yml
index 454a7299fb..dbb2d8f071 100644
--- a/vsts.yml
+++ b/vsts.yml
@@ -56,7 +56,6 @@ jobs:
       cd src
       ninja -C out/Default third_party/electron_node:headers
     displayName: Build Node.js headers for testing
-    condition: and(succeeded(), eq(variables['RUN_TESTS'], '1'))
 
   - bash: |
       cd src