diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 8d8909582..cfcfcad1b 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -563,8 +563,6 @@ jobs: trigger: true passed: - build-boot-java-atom-package - - task: no-fatjar - file: sts4/concourse/tasks/no-fatjar.yml - task: build-atom-package params: package_name: atom-boot-java diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 7defd0a00..bee5a4075 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -6,10 +6,8 @@ output=$workdir/out #atom_commons=$workdir/sts4/atom-extensions/atom-commons atom_package=$workdir/sts4/atom-extensions/$package_name -if [ -e $fatjar/version ]; then - url=`cat fatjar/url` - fatjar_version=`cat fatjar/version` -fi +url=`cat fatjar/url` +fatjar_version=`cat fatjar/version` #cd $atom_commons #npm install @@ -18,21 +16,11 @@ cd $atom_package #npm install ${atom_commons} -timestamp=`date -u +%Y%m%d%H%M` - -if [ -e $fatjar/version ]; then cat > properties.json << EOF { "jarUrl": "${url}" } EOF -else -cat > properties.json << EOF -{ - "timestamp": "${timestamp}" -} -EOF -fi npm install @@ -56,13 +44,8 @@ git config user.name "Alex Boyko" git add . -if [ -e $fatjar/version ]; then - git commit \ - -m "Publish $fatjar_version" -else - git commit \ - -m "Publish $timestamp" -fi +git commit \ + -m "Publish $fatjar_version" # Publish linkable artifact to S3 @@ -71,6 +54,8 @@ npm install bundle-deps node ./node_modules/bundle-deps/bundle-deps . +timestamp=`date -u +%Y%m%d%H%M` + basename=$(npm pack | tee /dev/tty) length=${#basename} diff --git a/concourse/tasks/no-fatjar.yml b/concourse/tasks/no-fatjar.yml deleted file mode 100644 index 05e3c3cf4..000000000 --- a/concourse/tasks/no-fatjar.yml +++ /dev/null @@ -1,10 +0,0 @@ -platform: linux -image_resource: - type: docker-image - source: - repository: kdvolder/sts4-build-env -outputs: -- name: fatjar -run: - path: echo - args: [ "Faking it there is no fatjar" ]