From 394bfad492de958766c0f0ab4611206942356618 Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 8 Dec 2016 14:14:21 -0800
Subject: [PATCH] Add a output to 'build-vsix' task

---
 concourse/destroy-pipeline.sh               |  3 ++-
 concourse/pipeline.yml                      | 16 +++-------------
 concourse/set-pipeline.sh                   |  3 ++-
 concourse/tasks/build-vscode-extensions.sh  |  9 +++++++++
 concourse/tasks/build-vscode-extensions.yml | 11 +++++++++++
 5 files changed, 27 insertions(+), 15 deletions(-)
 create mode 100755 concourse/tasks/build-vscode-extensions.sh
 create mode 100644 concourse/tasks/build-vscode-extensions.yml

diff --git a/concourse/destroy-pipeline.sh b/concourse/destroy-pipeline.sh
index 8ea3696dd..09a9e09db 100755
--- a/concourse/destroy-pipeline.sh
+++ b/concourse/destroy-pipeline.sh
@@ -1,3 +1,4 @@
 #!/bin/bash
-fly -t tools destroy-pipeline -p sts4
+branch=`git rev-parse --abbrev-ref HEAD`
+fly -t tools destroy-pipeline -p sts4-${branch}
 
diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 86a4c8fa0..0a50467d8 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -9,7 +9,7 @@ resources:
   type: git
   source:
     uri: git@github.com:spring-projects/sts4.git
-    branch: master
+    branch: {{branch}}
     username: kdvolder
     private_key: {{rsa_id}}
     paths:
@@ -18,7 +18,7 @@ resources:
   type: git
   source:
     uri: git@github.com:spring-projects/sts4.git
-    branch: master
+    branch: {{branch}}
     private_key: {{rsa_id}}
 - name: slack-notification
   type: slack-notification
@@ -47,17 +47,7 @@ jobs:
   - get: sts4
     trigger: true
   - task: build-vscode-extensions
-    config:
-      inputs:
-      - name: sts4
-      platform: linux
-      image_resource:
-        type: docker-image
-        source:
-          repository: kdvolder/sts4-build-env
-      run:
-        path: "./build-all.sh"
-        dir: "sts4/vscode-extensions"
+    file: sts4/concourse/tasks/build-vscode-extensions.yml
     on_failure:
       put: slack-notification
       params:
diff --git a/concourse/set-pipeline.sh b/concourse/set-pipeline.sh
index 5aa68d994..3c0bd8898 100755
--- a/concourse/set-pipeline.sh
+++ b/concourse/set-pipeline.sh
@@ -1,2 +1,3 @@
 #!/bin/bash
-fly -t tools set-pipeline --load-vars-from ${HOME}/.sts4-concourse-credentials.yml -p sts4 -c pipeline.yml
+branch=`git rev-parse --abbrev-ref HEAD`
+fly -t tools set-pipeline --var "branch=${branch}"--load-vars-from ${HOME}/.sts4-concourse-credentials.yml -p sts4-${branch} -c pipeline.yml
diff --git a/concourse/tasks/build-vscode-extensions.sh b/concourse/tasks/build-vscode-extensions.sh
new file mode 100755
index 000000000..7b8fda18c
--- /dev/null
+++ b/concourse/tasks/build-vscode-extensions.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+
+cd sts4/vscode-extensions
+./build-all.sh
+
+cd $workdir
+mv sts4/vscode-extensions/vscode-*/target/*.vsix vsix-files/
diff --git a/concourse/tasks/build-vscode-extensions.yml b/concourse/tasks/build-vscode-extensions.yml
new file mode 100644
index 000000000..11a108490
--- /dev/null
+++ b/concourse/tasks/build-vscode-extensions.yml
@@ -0,0 +1,11 @@
+inputs:
+- name: sts4
+outputs:
+- name: vsix-files
+platform: linux
+image_resource:
+  type: docker-image
+  source:
+    repository: kdvolder/sts4-build-env
+run:
+  path: "sts4/concourse/tasks/build-vscode-extensions.sh"