From f5544410f5cc2830df2de3127561868a497d7ed5 Mon Sep 17 00:00:00 2001 From: Kris De Volder Date: Wed, 21 Feb 2018 16:19:52 -0800 Subject: [PATCH] Attempt to fix build-atom-packahe.sh to work without a fatjar --- concourse/tasks/build-atom-package.sh | 27 ++++++++++++++++++++------ concourse/tasks/build-atom-package.yml | 1 + 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 70b072510..910304ab4 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -6,8 +6,10 @@ output=$workdir/out #atom_commons=$workdir/sts4/atom-extensions/atom-commons atom_package=$workdir/sts4/atom-extensions/$package_name -url=`cat fatjar/url` -fatjar_version=`cat fatjar/version` +if [ -e $fatjar ]; then + url=`cat fatjar/url` + fatjar_version=`cat fatjar/version` +fi #cd $atom_commons #npm install @@ -16,11 +18,21 @@ cd $atom_package #npm install ${atom_commons} +timestamp=`date -u +%Y%m%d%H%M` + +if [ -e $fatjar ]; then cat > properties.json << EOF { "jarUrl": "${url}" } EOF +else +cat > properties.json << EOF +{ + "timestamp": "${timestamp}" +} +EOF +fi npm install @@ -44,8 +56,13 @@ git config user.name "Alex Boyko" git add . -git commit \ - -m "Publish ${fatjar_version}" +if [ -e $fatjar ]; then + git commit \ + -m "Publish $fatjar_version" +else + git commit \ + -m "Publish $timestamp" +fi # Publish linkable artifact to S3 @@ -56,8 +73,6 @@ node ./node_modules/bundle-deps/bundle-deps . basename=$(npm pack | tee /dev/tty) -timestamp=`date -u +%Y%m%d%H%M` - length=${#basename} newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} diff --git a/concourse/tasks/build-atom-package.yml b/concourse/tasks/build-atom-package.yml index edec0589e..4180fe5bf 100644 --- a/concourse/tasks/build-atom-package.yml +++ b/concourse/tasks/build-atom-package.yml @@ -2,6 +2,7 @@ inputs: - name: sts4 - name: release_repo - name: fatjar + optional: true params: package_name: atom-bosh outputs: