Merge branch 'concourse'

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}
 

concourse/docker/Dockerfile

@@ -5,6 +5,7 @@ ADD npmrc /root/.npmrc
 RUN apt-get update && apt-get install -y \
   build-essential \
   git \
+  jq \
   openjdk-8-jdk \
   maven \
   curl

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,8 +18,24 @@ resources:
   type: git
   source:
     uri: git@github.com:spring-projects/sts4.git
-    branch: master
+    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}}
+    region_name: {{s3_region}}
+    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}}
+    region_name: {{s3_region}}
+    regexp: sts4/vscode-extensions/vscode-manifest-yaml-(.*).vsix
 - name: slack-notification
   type: slack-notification
   source:
@@ -47,20 +63,18 @@ 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_success:
+      aggregate:
+      - put: s3-manifest-yaml-vsix
+        params: 
+          file: vsix-files/vscode-manifest-yaml-*.vsix
+      - put: s3-boot-properties-vsix
+        params: 
+          file: vsix-files/vscode-boot-properties-*.vsix
     on_failure:
       put: slack-notification
       params:
         channel: "@kdvolder"
         text: | 
-           Concourse ${BUILD_JOB_NAME}/${BUILD_NAME} has failed!
+           Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed!

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

concourse/tasks/build-vscode-extensions.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+
+cd sts4/vscode-extensions
+./build-all.sh
+
+cd $workdir
+cp `find sts4/vscode-extensions -name "*.vsix"` vsix-files
+

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"

eclipse-distribution/common/html/nightly-distributions.html

@@ -40,7 +40,7 @@
 	<ul>
 		<li>Spring Boot Property Language Server for Visual Studio Code:<br/> <a href="http://dist.springsource.com/snapshot/STS4/nightly/vscode-extensions/vscode-boot-properties/vscode-boot-properties-0.0.1.vsix">vscode-boot-properties-0.0.1.vsix</a></li>
 		<br/>
-		<li>Cloud Foundry Manifest Language Server for Visual Studio Code:<br/> <a href="http://dist.springsource.com/snapshot/STS4/nightly/vscode-extensions/vscode-manifest-yaml/vscode-manifest-yml-0.0.1.vsix">vscode-manifest-yml-0.0.1.vsix</a></li>
+		<li>Cloud Foundry Manifest Language Server for Visual Studio Code:<br/> <a href="http://dist.springsource.com/snapshot/STS4/nightly/vscode-extensions/vscode-manifest-yaml/vscode-manifest-yml-0.0.1.vsix">vscode-manifest-yaml-0.0.1.vsix</a></li>
 	</ul>
 	
 </div>

vscode-extensions/build-all.sh

@@ -2,6 +2,9 @@
 set -e
 
 base_dir=`pwd`
+
+timestamp=`date -u +%Y%m%d%H%M`
+
 cd ${base_dir}/commons-vscode
 npm install
 
@@ -17,6 +20,11 @@ for i in vscode-boot-properties vscode-manifest-yaml ; do
     echo "***************************************************************************************"
     
     npm install ../commons-vscode
+
+    base_version=`jq -r .version package.json`
+    qualified_version=${base_version}-${timestamp}
+
+    npm version ${qualified_version}
     npm install
     npm run vsce-package
 done

vscode-extensions/vscode-manifest-yaml/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "vscode-manifest-yml",
+  "name": "vscode-manifest-yaml",
   "displayName": "Cloudfoundry Manifest YML Support",
   "description": "Provides validation and content assist for Cloudfoundry manifest.yml files",
   "icon": "icon.png",