From 57e86c5db220a8650e0abfe74a8ac016061ed6eb Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 14 Dec 2016 17:15:52 -0800 Subject: [PATCH] Work building of concourse vsix into the build --- concourse/pipeline.yml | 16 ++++++++++++++++ concourse/tasks/build-website.sh | 5 +++++ concourse/tasks/build-website.yml | 1 + vscode-extensions/build-all.sh | 2 +- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 243fb8854..36298d87b 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -34,6 +34,14 @@ resources: secret_access_key: {{s3_secretkey}} region_name: {{s3_region}} regexp: sts4/vscode-extensions/vscode-boot-properties-(.*).vsix +- name: s3-concourse-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-concourse-(.*).vsix - name: s3-manifest-yaml-vsix type: s3 source: @@ -91,6 +99,10 @@ jobs: params: file: vsix-files/vscode-boot-properties-*.vsix acl: public-read + - put: s3-concourse-vsix + params: + file: vsix-files/vscode-concourse-*.vsix + acl: public-read on_failure: put: slack-notification params: @@ -109,6 +121,10 @@ jobs: passed: - build-vsix trigger: true + - get: s3-concourse-vsix + passed: + - build-vsix + trigger: true - task: build-website file: sts4/concourse/tasks/build-website.yml - put: website diff --git a/concourse/tasks/build-website.sh b/concourse/tasks/build-website.sh index 50ec31994..e21796df6 100755 --- a/concourse/tasks/build-website.sh +++ b/concourse/tasks/build-website.sh @@ -13,6 +13,8 @@ export vscode_manifest_yaml=$(basename s3-manifest-yaml-vsix/*.vsix) echo "vscode_manifest_yaml=$vscode_manifest_yaml" export vscode_boot_properties=$(basename s3-boot-properties-vsix/*.vsix) echo "vscode_boot_properties=$vscode_boot_properties" +export vscode_concourse=$(basename s3-concourse-vsix/*.vsix) +echo "vscode_concourse=$vscode_concourse" envsubst > "$target/vscode-extensions-snippet.html" << XXXXXX XXXXXX diff --git a/concourse/tasks/build-website.yml b/concourse/tasks/build-website.yml index c6325f3e7..f0da95ef1 100644 --- a/concourse/tasks/build-website.yml +++ b/concourse/tasks/build-website.yml @@ -2,6 +2,7 @@ inputs: - name: sts4 - name: s3-manifest-yaml-vsix - name: s3-boot-properties-vsix +- name: s3-concourse-vsix outputs: - name: website platform: linux diff --git a/vscode-extensions/build-all.sh b/vscode-extensions/build-all.sh index 9b5ce432a..4d7db08c5 100755 --- a/vscode-extensions/build-all.sh +++ b/vscode-extensions/build-all.sh @@ -9,7 +9,7 @@ cd ${base_dir}/commons-vscode npm install cd $base_dir -for i in vscode-boot-properties vscode-manifest-yaml ; do +for i in vscode-boot-properties vscode-manifest-yaml vscode-concourse; do cd ${base_dir}/${i} echo "***************************************************************************************" echo "***************************************************************************************"