From ba30c1e293ae5f06576e31bcd71480aad41fa800 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 3 Aug 2017 16:58:40 -0400 Subject: [PATCH 01/16] Remove commented out temp data --- concourse/pipeline.yml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 17605013b..04ca99397 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -492,15 +492,6 @@ jobs: package_sources: atom-cf-manifest-yaml fatjar: s3-manifest-yaml-fatjar-snapshot file: sts4/concourse/tasks/build-atom-package.yml - -#boot-java-language-server-0.0.2-201708031854.jar -# -rw-r--r-- 1 root root 16846312 Aug 3 18:54 boot-properties-language-server-0.0.2-201708031854.jar -# -rw-r--r-- 1 root root 7936924 Aug 3 18:54 bosh-language-server-0.0.8-201708031854.jar -# -rw-r--r-- 1 root root 7979261 Aug 3 18:54 concourse-language-server-0.0.8-201708031854.jar -# -rw-r--r-- 1 root root 20783856 Aug 3 18:54 manifest-yaml-language-server-0.0.9-201708031854.jar - - - on_failure: put: slack-notification params: From 481175b04457d18a6819aa45c90f809fac342003 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Thu, 3 Aug 2017 19:44:26 -0400 Subject: [PATCH 02/16] Allow public read for fatjars --- concourse/pipeline.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index 6786c7dc2..c52a74c4c 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -464,9 +464,11 @@ jobs: - put: s3-manifest-yaml-fatjar-snapshot params: file: out/manifest-yaml-language-server-*.jar + acl: public-read - put: s3-concourse-fatjar-snapshot params: file: out/concourse-language-server-*.jar + acl: public-read - name: build-manifest-yaml-atom-package plan: - aggregate: From 5a264d14d580ca1e92dc6c48a034e449ea1ade1e Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 11:32:31 -0400 Subject: [PATCH 03/16] Cleanup --- atom-extensions/atom-commons/src/jar-language-client.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/atom-extensions/atom-commons/src/jar-language-client.js b/atom-extensions/atom-commons/src/jar-language-client.js index e39c4ee2e..ebc46be07 100644 --- a/atom-extensions/atom-commons/src/jar-language-client.js +++ b/atom-extensions/atom-commons/src/jar-language-client.js @@ -125,12 +125,6 @@ export class JarLanguageClient extends AutoLanguageClient { }) } - // createRpcConnection(process) { - // let connection = super.createRpcConnection(process); - // connection.trace(rpc.Trace.Messages, console); - // return connection; - // } - findJavaExecutable(binname) { binname = this.correctBinname(binname); From 660a2c4aad15b2de28aa33d3736a8529045eefff Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 12:55:05 -0400 Subject: [PATCH 04/16] Build: Install atom-commons into atom package --- concourse/tasks/build-atom-package.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index abdf3399f..8740db625 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -7,4 +7,8 @@ url=`cat fatjar/url` echo "The url of the fatjar is ${url}" -ls -la \ No newline at end of file +ls -la + +cd package_sources +npm install ../sts4/atom-extensions/atom-commons +ls -la From ee88a8a734fc8002d347c9033f06e0673d3dd2bc Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 13:32:22 -0400 Subject: [PATCH 05/16] Build: modify fat jar url to the one produced by the build --- atom-extensions/atom-commons/package.json | 2 +- concourse/tasks/build-atom-package.sh | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/atom-extensions/atom-commons/package.json b/atom-extensions/atom-commons/package.json index 7675be97a..f480d59da 100644 --- a/atom-extensions/atom-commons/package.json +++ b/atom-extensions/atom-commons/package.json @@ -9,7 +9,7 @@ }, "main": "./dist/index", "dependencies": { - "atom-languageclient": "git://github.com/BoykoAlex/atom-languageclient#grammar-override", + "atom-languageclient": "git://github.com/atom/atom-languageclient#master", "decompress": "^4.2.0", "portfinder": "^1.0.13", "remote-file-size": "^3.0.3", diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 8740db625..c55f4da9f 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -11,4 +11,10 @@ ls -la cd package_sources npm install ../sts4/atom-extensions/atom-commons -ls -la +cat > properties.json << EOF +{ + jarUrl: ${url} +} +EOF + +cat properties.json \ No newline at end of file From a255935c55f25876f5cf244f87e8841646caa1ba Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 14:01:37 -0400 Subject: [PATCH 06/16] Build: create tarball of atom package with dependencies --- concourse/tasks/build-atom-package.sh | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index c55f4da9f..5609a93f1 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -10,11 +10,27 @@ echo "The url of the fatjar is ${url}" ls -la cd package_sources + npm install ../sts4/atom-extensions/atom-commons + cat > properties.json << EOF { jarUrl: ${url} } EOF -cat properties.json \ No newline at end of file +npm install + +npm install bundle-deps + +bundle-deps . + +npm pack + +timestamp=`date -u +%Y%m%d%H%M` +for i in `ls *.tgz`; do + basename=$(basename $i) + cp $i $output/${basename/SNAPSHOT/$timestamp} +done + +ls -la $output \ No newline at end of file From f5e9f47a2586282cfa8a2ab39eff7c8a8ccae1b7 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 14:16:49 -0400 Subject: [PATCH 07/16] Build: correct installation of `bundle-deps` --- concourse/tasks/build-atom-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 5609a93f1..2728b7d8c 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -23,7 +23,7 @@ npm install npm install bundle-deps -bundle-deps . +node ./node_modules/bundle-deps/bundle-deps . npm pack From 5fcc93aea7b615165a5311bca7de296e8a3e47ee Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 14:44:51 -0400 Subject: [PATCH 08/16] Build: correct tarball copying to out folder and upload to s3 --- concourse/pipeline.yml | 14 ++++++++++++++ concourse/tasks/build-atom-package.sh | 5 ++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/concourse/pipeline.yml b/concourse/pipeline.yml index c52a74c4c..4432f41cb 100644 --- a/concourse/pipeline.yml +++ b/concourse/pipeline.yml @@ -101,6 +101,14 @@ resources: secret_access_key: {{s3_secretkey}} region_name: {{s3_region}} regexp: sts4/fatjars/snapshots/concourse-language-server-(.*).jar +- name: s3-atom-cf-manifest-yaml-snapshot + type: s3 + source: + bucket: {{s3_bucket}} + access_key_id: {{s3_accesskey}} + secret_access_key: {{s3_secretkey}} + region_name: {{s3_region}} + regexp: sts4/atom/snapshots/(.*)cf-manifest-yaml-(.*).tgz - name: snapshot-website type: s3-multi source: @@ -491,3 +499,9 @@ jobs: params: text: | Concourse ${BUILD_PIPELINE_NAME}/${BUILD_JOB_NAME}/${BUILD_NAME} has failed! + on_success: + aggregate: + - put: s3-atom-cf-manifest-yaml-snapshot + params: + file: out/*cf-manifest-yaml-*.tgz + acl: public-read diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 2728b7d8c..bcf1ca728 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -27,10 +27,13 @@ node ./node_modules/bundle-deps/bundle-deps . npm pack +ls *.tgz + timestamp=`date -u +%Y%m%d%H%M` for i in `ls *.tgz`; do basename=$(basename $i) - cp $i $output/${basename/SNAPSHOT/$timestamp} + length = ${#basename} + cp $i $output/${basename:0:$length-4}-$timestamp${basename:$length-4:$length} done ls -la $output \ No newline at end of file From 3863f3862b0425702c0410573f0bc3e4e22c1c2c Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 14:59:55 -0400 Subject: [PATCH 09/16] Build: correct tarball copying --- concourse/tasks/build-atom-package.sh | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index bcf1ca728..0de28100d 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -25,15 +25,16 @@ npm install bundle-deps node ./node_modules/bundle-deps/bundle-deps . -npm pack +basename = $(npm pack) + +echo ${basename} ls *.tgz timestamp=`date -u +%Y%m%d%H%M` -for i in `ls *.tgz`; do - basename=$(basename $i) - length = ${#basename} - cp $i $output/${basename:0:$length-4}-$timestamp${basename:$length-4:$length} -done + +length = ${#basename} + +cp $basename $output/${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} ls -la $output \ No newline at end of file From 1ba72ba780c5a1838e6f9e0c531df45556772691 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 15:15:56 -0400 Subject: [PATCH 10/16] Build: correct name for tarball --- concourse/tasks/build-atom-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 0de28100d..be736428e 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -25,7 +25,7 @@ npm install bundle-deps node ./node_modules/bundle-deps/bundle-deps . -basename = $(npm pack) +basename = $(npm pack | tee /dev/tty) echo ${basename} From 4582b827b0983900c665d72daea93cefbbdf1fa9 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 15:29:46 -0400 Subject: [PATCH 11/16] Build: remove erroneous spaces from the script --- concourse/tasks/build-atom-package.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index be736428e..0e162eb00 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -25,7 +25,7 @@ npm install bundle-deps node ./node_modules/bundle-deps/bundle-deps . -basename = $(npm pack | tee /dev/tty) +basename=$(npm pack | tee /dev/tty) echo ${basename} @@ -33,7 +33,7 @@ ls *.tgz timestamp=`date -u +%Y%m%d%H%M` -length = ${#basename} +length=${#basename} cp $basename $output/${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} From f5e136bd33726576eed7596a32e1ee70d33abcf2 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 15:46:54 -0400 Subject: [PATCH 12/16] Build: debugging --- concourse/tasks/build-atom-package.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 0e162eb00..ffe719a36 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -35,6 +35,10 @@ timestamp=`date -u +%Y%m%d%H%M` length=${#basename} -cp $basename $output/${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} +newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} -ls -la $output \ No newline at end of file +echo ${newName} +cp $basename $output/${newName} + +cd $output +ls -la \ No newline at end of file From 6d4c582157dc0d5f5b208061c527f01b3d2075cb Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 15:57:21 -0400 Subject: [PATCH 13/16] Build: debugging --- concourse/tasks/build-atom-package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index ffe719a36..56674eec4 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -38,7 +38,7 @@ length=${#basename} newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} echo ${newName} -cp $basename $output/${newName} +cp ${basename} $output/${newName} cd $output ls -la \ No newline at end of file From 4b959a7ab7f8fd609ba02a209c77d51ab8656b6a Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 16:13:17 -0400 Subject: [PATCH 14/16] Build: debugging copying of tarball file --- concourse/tasks/build-atom-package.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 56674eec4..b5795585b 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -38,7 +38,8 @@ length=${#basename} newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} echo ${newName} -cp ${basename} $output/${newName} +cp ${basename} ${newName} +cp ${basename} ${output}/${newName} cd $output ls -la \ No newline at end of file From 51dd0a621a9a240f9b7324f44618d066140600a5 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 16:35:58 -0400 Subject: [PATCH 15/16] Build: speed up atom ls build for debugging --- concourse/tasks/atom-language-servers-test.sh | 2 +- concourse/tasks/build-atom-package.sh | 9 ++------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/concourse/tasks/atom-language-servers-test.sh b/concourse/tasks/atom-language-servers-test.sh index 76f96f6a1..a026e8f4b 100755 --- a/concourse/tasks/atom-language-servers-test.sh +++ b/concourse/tasks/atom-language-servers-test.sh @@ -14,7 +14,7 @@ else fi cd ${sources} -./mvnw package -DargLine="-Dlsp.lazy.completions.disable=true -Dlsp.completions.indentation.enable=true -Dlsp.yaml.completions.errors.disable=true" +./mvnw package -DskipTests -DargLine="-Dlsp.lazy.completions.disable=true -Dlsp.completions.indentation.enable=true -Dlsp.yaml.completions.errors.disable=true" timestamp=`date -u +%Y%m%d%H%M` for i in `ls *-language-server/target/*.jar`; do diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index b5795585b..1717cca76 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -2,6 +2,7 @@ set -e set -v workdir=`pwd` +output=$workdir/out url=`cat fatjar/url` @@ -27,19 +28,13 @@ node ./node_modules/bundle-deps/bundle-deps . basename=$(npm pack | tee /dev/tty) -echo ${basename} - -ls *.tgz - timestamp=`date -u +%Y%m%d%H%M` length=${#basename} newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} -echo ${newName} -cp ${basename} ${newName} -cp ${basename} ${output}/${newName} +cp ${basename} $output/${newName} cd $output ls -la \ No newline at end of file From e1816b9a3142315d55e8822b55fb13e9d281db41 Mon Sep 17 00:00:00 2001 From: BoykoAlex Date: Fri, 4 Aug 2017 16:53:59 -0400 Subject: [PATCH 16/16] Build: finalized tarball file publishing --- concourse/tasks/atom-language-servers-test.sh | 2 +- concourse/tasks/build-atom-package.sh | 9 +-------- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/concourse/tasks/atom-language-servers-test.sh b/concourse/tasks/atom-language-servers-test.sh index a026e8f4b..76f96f6a1 100755 --- a/concourse/tasks/atom-language-servers-test.sh +++ b/concourse/tasks/atom-language-servers-test.sh @@ -14,7 +14,7 @@ else fi cd ${sources} -./mvnw package -DskipTests -DargLine="-Dlsp.lazy.completions.disable=true -Dlsp.completions.indentation.enable=true -Dlsp.yaml.completions.errors.disable=true" +./mvnw package -DargLine="-Dlsp.lazy.completions.disable=true -Dlsp.completions.indentation.enable=true -Dlsp.yaml.completions.errors.disable=true" timestamp=`date -u +%Y%m%d%H%M` for i in `ls *-language-server/target/*.jar`; do diff --git a/concourse/tasks/build-atom-package.sh b/concourse/tasks/build-atom-package.sh index 1717cca76..becb0443a 100755 --- a/concourse/tasks/build-atom-package.sh +++ b/concourse/tasks/build-atom-package.sh @@ -6,10 +6,6 @@ output=$workdir/out url=`cat fatjar/url` -echo "The url of the fatjar is ${url}" - -ls -la - cd package_sources npm install ../sts4/atom-extensions/atom-commons @@ -34,7 +30,4 @@ length=${#basename} newName=${basename:0:${length}-4}-$timestamp${basename:${length}-4:${length}} -cp ${basename} $output/${newName} - -cd $output -ls -la \ No newline at end of file +cp ${basename} $output/${newName} \ No newline at end of file