Fixes to pipeline

concourse/tasks/build-vsix.sh

@@ -0,0 +1,39 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+sources=$workdir/sts4/vscode-extensions/$extension_id
+
+cd ${sources}/../commons-vscode
+npm install
+
+cd "$sources"
+
+npm install ../commons-vscode
+
+timestamp=`date -u +%Y%m%d%H%M`
+
+if [ "$dist_type" != release ]; then
+    # for snapshot build, work the timestamp into package.json version qualifier
+    base_version=`jq -r .version package.json`
+    qualified_version=${base_version}-${timestamp}
+    npm version ${qualified_version}
+fi
+
+npm install
+npm run vsce-package
+
+# for release build we don't don't add version-qualifier to package.json
+# So we must instead rename the file ourself to add a qualifier
+if [ "$dist_type" == release ]; then
+    vsix_file=`ls *.vsix`
+    release_name=`git describe --tags`
+    echo "release_name=$release_name"
+    if [ -z "$release_name" ]; then
+        echo "Release Candidates must be tagged" >&2
+        exit 1
+    else
+        mv $vsix_file ${release_name}.vsix
+    fi
+fi
+
+cp *.vsix $workdir/out

concourse/tasks/build-vsix.yml

@@ -0,0 +1,11 @@
+inputs:
+- name: sts4
+outputs:
+- name: out
+platform: linux
+image_resource:
+  type: docker-image
+  source:
+    repository: kdvolder/sts4-build-env
+run:
+  path: sts4/concourse/tasks/build-vsix.sh

concourse/tasks/build-website.sh

@@ -3,33 +3,34 @@ set -e
 workdir=`pwd`
 sources=$workdir/sts4/eclipse-distribution/common/html
 target=$workdir/website
+# consider passing this in from pipeline as a env var if we are also going to use it for 'release' builds
+dist_type=snapshot
 
 #cp -r "${sources}/stylesheet.css" "$target"
 #cp -r ${sources}/*.js "$target"
 #cp s3-manifest-yaml-vsix/*.vsix "$target"
 #cp s3-boot-properties-vsix/*.vsix "$target"
 
-export vscode_manifest_yaml=$(basename s3-manifest-yaml-vsix/*.vsix)
+export vscode_manifest_yaml=$(basename s3-manifest-yaml-vsix-${dist_type}/*.vsix)
 echo "vscode_manifest_yaml=$vscode_manifest_yaml"
-export vscode_boot_properties=$(basename s3-boot-properties-vsix/*.vsix)
+export vscode_boot_properties=$(basename s3-boot-properties-vsix-${dist_type}/*.vsix)
 echo "vscode_boot_properties=$vscode_boot_properties"
-export vscode_concourse=$(basename s3-concourse-vsix/*.vsix)
+export vscode_concourse=$(basename s3-concourse-vsix-${dist_type}/*.vsix)
 echo "vscode_concourse=$vscode_concourse"
 
 envsubst > "$target/vscode-extensions-snippet.html" << XXXXXX
 <ul>
    <li>Spring Boot Property Language Server: 
-       <a href="http://s3-test.spring.io/sts4/vscode-extensions/${vscode_boot_properties}">${vscode_boot_properties}</a> 
+       <a href="http://s3-test.spring.io/sts4/vscode-extensions/${dist_type}/${vscode_boot_properties}">${vscode_boot_properties}</a> 
    </li>
    <li>Cloud Foundry Manifest Language Server: 
-       <a href="http://s3-test.spring.io/sts4/vscode-extensions/${vscode_manifest_yaml}">${vscode_manifest_yaml}</a> 
+       <a href="http://s3-test.spring.io/sts4/vscode-extensions/${dist_type}/${vscode_manifest_yaml}">${vscode_manifest_yaml}</a> 
    </li>
    <li>Concourse CI Language Server: 
-       <a href="http://s3-test.spring.io/sts4/vscode-extensions/${vscode_concourse}">${vscode_concourse}</a> 
+       <a href="http://s3-test.spring.io/sts4/vscode-extensions/${dist_type}/${vscode_concourse}">${vscode_concourse}</a> 
    </li>
 </ul>
 XXXXXX
-
 export vscode_snippet=`cat "$target/vscode-extensions-snippet.html"`
 
 envsubst > "$target/vscode-extensions.html" << XXXXXX

concourse/tasks/build-website.yml

@@ -1,8 +1,8 @@
 inputs:
 - name: sts4
-- name: s3-manifest-yaml-vsix
-- name: s3-boot-properties-vsix
-- name: s3-concourse-vsix
+- name: s3-manifest-yaml-vsix-snapshot
+- name: s3-boot-properties-vsix-snapshot
+- name: s3-concourse-vsix-snapshot
 outputs:
 - name: website
 platform: linux

concourse/tasks/bump-version.sh

@@ -0,0 +1,25 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+
+echo "extension_id=$extension_id"
+
+sources=$workdir/sts4/vscode-extensions/$extension_id
+release_version=`jq -r .version ${sources}/package.json`
+
+echo "release_version=$release_version"
+
+cd $sources
+
+echo "Bumping version of ${extension_id}"
+echo "release_version=${release_version}"
+npm version patch
+
+new_version=`jq -r .version ${sources}/package.json`
+echo "new_version=${new_version}"
+
+git commit \
+    -m "Bump version of ${extension_id} to ${new_version}" \
+    --author 'Kris De Volder <kdevolder@pivotal.io>'
+
+git clone $workdir/sts4 $workdir/sts4-out

concourse/tasks/bump-version.yml

@@ -0,0 +1,11 @@
+inputs:
+- name: sts4
+outputs:
+- name: sts4-out
+platform: linux
+image_resource:
+  type: docker-image
+  source:
+    repository: kdvolder/sts4-build-env
+run:
+  path: sts4/concourse/tasks/bump-version.sh

concourse/tasks/vsce-publish.sh

@@ -0,0 +1,30 @@
+#!/bin/bash
+set -e
+workdir=`pwd`
+
+vsix_file=`ls ${workdir}/vsix-resource/*.vsix`
+
+echo "vsix_file=$vsix_file"
+echo "extension_id=$extension_id"
+
+sources=$workdir/sts4/vscode-extensions/$extension_id
+
+release_version=`jq -r .version ${sources}/package.json`
+
+echo "release_version=$release_version"
+
+vsce publish -p $vsce_token --packagePath "$vsix_file"
+
+echo "****************************************************************"
+echo "****************************************************************"
+echo "****************************************************************"
+echo "*** $extension_id $version published to vscode marketplace *****"
+echo "****************************************************************"
+echo "****************************************************************"
+echo "****************************************************************"
+
+cd $sources
+
+echo "Tagging release"
+git tag ${extension_id}-${release_version}-RELEASE
+git clone $workdir/sts4 $workdir/sts4-out

concourse/tasks/vsce-publish.yml

@@ -0,0 +1,13 @@
+inputs:
+- name: sts4
+- name: vsix-resource
+outputs:
+- name: sts4-out
+- name: website
+platform: linux
+image_resource:
+  type: docker-image
+  source:
+    repository: kdvolder/sts4-build-env
+run:
+  path: sts4/concourse/tasks/vsce-publish.sh