From 16218fcc660a0b1dc2e848feebdeb39b8d036b4d Mon Sep 17 00:00:00 2001
From: Kris De Volder <kdevolder@pivotal.io>
Date: Thu, 8 Dec 2016 15:33:41 -0800
Subject: [PATCH] A few little fixes

---
 concourse/pipeline.yml                     | 22 ++++++++++++++++++++++
 concourse/set-pipeline.sh                  |  2 +-
 concourse/tasks/build-vscode-extensions.sh |  3 ++-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml
index 0a50467d8..9b44aebe9 100644
--- a/concourse/pipeline.yml
+++ b/concourse/pipeline.yml
@@ -20,6 +20,20 @@ resources:
     uri: git@github.com:spring-projects/sts4.git
     branch: {{branch}}
     private_key: {{rsa_id}}
+- name: s3-boot-properties-vsix
+  type: s3
+  source:
+    bucket: {{s3_bucket}}
+    access_key_id: {{s3_accesskey}}
+    secret_access_key: {{s3_secretkey}}
+    regexp: sts4/vscode-extensions/vscode-boot-properties-(.*).vsix
+- name: s3-manifest-yaml-vsix
+  type: s3
+  source:
+    bucket: {{s3_bucket}}
+    access_key_id: {{s3_accesskey}}
+    secret_access_key: {{s3_secretkey}}
+    regexp: sts4/vscode-extensions/vscode-manifest-yaml-(.*).vsix
 - name: slack-notification
   type: slack-notification
   source:
@@ -48,6 +62,14 @@ jobs:
     trigger: true
   - task: build-vscode-extensions
     file: sts4/concourse/tasks/build-vscode-extensions.yml
+    on_success:
+      aggregate:
+      - put: s3-manifest-yaml-vsix
+        params: 
+          file: sts4/vscode-extensions/vscode-manifest-yaml/*.vsix
+      - put: s3-boot-properties-vsix
+        params: 
+          file: sts4/vscode-extensions/vscode-boot-properties/*.vsix
     on_failure:
       put: slack-notification
       params:
diff --git a/concourse/set-pipeline.sh b/concourse/set-pipeline.sh
index 3c0bd8898..2fcdaabc5 100755
--- a/concourse/set-pipeline.sh
+++ b/concourse/set-pipeline.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 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
+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
index 7b8fda18c..8b7e4ce7d 100755
--- a/concourse/tasks/build-vscode-extensions.sh
+++ b/concourse/tasks/build-vscode-extensions.sh
@@ -6,4 +6,5 @@ cd sts4/vscode-extensions
 ./build-all.sh
 
 cd $workdir
-mv sts4/vscode-extensions/vscode-*/target/*.vsix vsix-files/
+mv sts4/vscode-extensions/vscode-manifest-yaml/target/*.vsix vsix-files/
+mv sts4/vscode-extensions/vscode-boot-properties/target/*.vsix vsix-files/