From 394bfad492de958766c0f0ab4611206942356618 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 14:14:21 -0800 Subject: [PATCH 01/10] 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" From 16218fcc660a0b1dc2e848feebdeb39b8d036b4d Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 15:33:41 -0800 Subject: [PATCH 02/10] 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/ From 2ecf5571b4b62a2dd27c034cf1ae10535cf7341e Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 15:40:25 -0800 Subject: [PATCH 03/10] Improve slack notification msg --- concourse/pipeline.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 9b44aebe9..849fc9ce4 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -75,4 +75,4 @@ jobs: params: channel: "@kdvolder" text: | - Concourse ${BUILD_JOB_NAME}/${BUILD_NAME} has failed! + Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! From 77884a00ba3df26749ada7cffbb87ce302b9162a Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 16:00:29 -0800 Subject: [PATCH 04/10] Try to fix problem copying build .vsix files --- concourse/tasks/build-vscode-extensions.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/concourse/tasks/build-vscode-extensions.sh b/concourse/tasks/build-vscode-extensions.sh index 8b7e4ce7d..26560819e 100755 --- a/concourse/tasks/build-vscode-extensions.sh +++ b/concourse/tasks/build-vscode-extensions.sh @@ -6,5 +6,5 @@ cd sts4/vscode-extensions ./build-all.sh cd $workdir -mv sts4/vscode-extensions/vscode-manifest-yaml/target/*.vsix vsix-files/ -mv sts4/vscode-extensions/vscode-boot-properties/target/*.vsix vsix-files/ +cp sts4/vscode-extensions/vscode-manifest-yaml/*.vsix vsix-files/ +cp sts4/vscode-extensions/vscode-boot-properties/*.vsix vsix-files/ From 4055b36fb0a33052718139362d732194d11f84e7 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 16:20:19 -0800 Subject: [PATCH 05/10] More fixing --- concourse/pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 849fc9ce4..a97406c25 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -66,10 +66,10 @@ jobs: aggregate: - put: s3-manifest-yaml-vsix params: - file: sts4/vscode-extensions/vscode-manifest-yaml/*.vsix + file: vsix-files/vscode-manifest-yaml-*.vsix - put: s3-boot-properties-vsix params: - file: sts4/vscode-extensions/vscode-boot-properties/*.vsix + file: vsix-files/vscode-boot-properties-*.vsix on_failure: put: slack-notification params: From d5d2091ee8f04054e2713117fdb020c3426b2fa5 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 16:21:09 -0800 Subject: [PATCH 06/10] Consitently use 'manifest-yaml' everywhere Not manifest-yaml somplaces and manifest-yml in others. --- eclipse-distribution/common/html/nightly-distributions.html | 2 +- vscode-extensions/vscode-manifest-yaml/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/eclipse-distribution/common/html/nightly-distributions.html b/eclipse-distribution/common/html/nightly-distributions.html index a9a7b1b9e..20bb6ee7e 100644 --- a/eclipse-distribution/common/html/nightly-distributions.html +++ b/eclipse-distribution/common/html/nightly-distributions.html @@ -40,7 +40,7 @@ diff --git a/vscode-extensions/vscode-manifest-yaml/package.json b/vscode-extensions/vscode-manifest-yaml/package.json index ea32fad28..c1d3a72ca 100644 --- a/vscode-extensions/vscode-manifest-yaml/package.json +++ b/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", From 34e0718d6354f941e3f3e1ed62d0c1c2481336dd Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 16:51:15 -0800 Subject: [PATCH 07/10] Try to add timesamp to vsix file names --- concourse/tasks/build-vscode-extensions.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/concourse/tasks/build-vscode-extensions.sh b/concourse/tasks/build-vscode-extensions.sh index 26560819e..0d44656a1 100755 --- a/concourse/tasks/build-vscode-extensions.sh +++ b/concourse/tasks/build-vscode-extensions.sh @@ -6,5 +6,9 @@ cd sts4/vscode-extensions ./build-all.sh cd $workdir -cp sts4/vscode-extensions/vscode-manifest-yaml/*.vsix vsix-files/ -cp sts4/vscode-extensions/vscode-boot-properties/*.vsix vsix-files/ +vsix_files=`find sts4 -name "*.visx"` + +for f in ${vsix_files}; do + new_name = $(basename "$f" .vsix)-`date -u +%Y%m%d%H%M` + mv "$f" "vsix_files/$new_name" +done From 38e352792eb8e6e70a3793dbd8e7b33863ab8b14 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 17:28:32 -0800 Subject: [PATCH 08/10] Add 'jq' tool to docker image --- concourse/docker/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/concourse/docker/Dockerfile b/concourse/docker/Dockerfile index b40a4c011..f2fd58f7e 100644 --- a/concourse/docker/Dockerfile +++ b/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 From e649f8cc45f08c22653df282bf2b26d27ce3979e Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 17:39:23 -0800 Subject: [PATCH 09/10] Try add a build qualifier to vsode extensions --- concourse/tasks/build-vscode-extensions.sh | 6 +----- vscode-extensions/build-all.sh | 8 ++++++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/concourse/tasks/build-vscode-extensions.sh b/concourse/tasks/build-vscode-extensions.sh index 0d44656a1..c18fdfb05 100755 --- a/concourse/tasks/build-vscode-extensions.sh +++ b/concourse/tasks/build-vscode-extensions.sh @@ -6,9 +6,5 @@ cd sts4/vscode-extensions ./build-all.sh cd $workdir -vsix_files=`find sts4 -name "*.visx"` +cp `find sts4/vscode-extensions -name "*.vsix"` vsix-files -for f in ${vsix_files}; do - new_name = $(basename "$f" .vsix)-`date -u +%Y%m%d%H%M` - mv "$f" "vsix_files/$new_name" -done diff --git a/vscode-extensions/build-all.sh b/vscode-extensions/build-all.sh index cff2b14aa..9b5ce432a 100755 --- a/vscode-extensions/build-all.sh +++ b/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 From 5fbdf8a77149193c058eb489608ecd873743d254 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Thu, 8 Dec 2016 17:58:26 -0800 Subject: [PATCH 10/10] Add region to s3 configs --- concourse/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index a97406c25..9bbc5bbea 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -26,6 +26,7 @@ resources: 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 @@ -33,6 +34,7 @@ resources: 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