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/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 diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 86a4c8fa0..9bbc5bbea 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,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! diff --git a/concourse/set-pipeline.sh b/concourse/set-pipeline.sh index 5aa68d994..2fcdaabc5 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..c18fdfb05 --- /dev/null +++ b/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 + 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" 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/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 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",