From 69ef4e6f0745fdb5ca3ce6956d0064c1010ada0a Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 May 2016 20:01:03 +0200 Subject: [PATCH 01/22] [TASK] Added Type name --- pom.xml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index a57b7a3..43ec66d 100755 --- a/pom.xml +++ b/pom.xml @@ -12,11 +12,12 @@ 1.7 + Parabot Parabot client - This is the Parabot client for all kind of RSPS'. This does not contain the API. + The only perfect open source (Runescape private server) bot! http://www.parabot.org/ @@ -120,7 +121,7 @@ org.parabot.Landing - ${project.build.directory}/final/ + ${project.build.directory}/final/${type.name}/ false From 0b42d41c583fb45c5a9146083874accc4ab3e05d Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 May 2016 20:01:16 +0200 Subject: [PATCH 02/22] [FEATURE] Added call creation sh file --- .travis/call-creation.sh | 3 +++ 1 file changed, 3 insertions(+) create mode 100755 .travis/call-creation.sh diff --git a/.travis/call-creation.sh b/.travis/call-creation.sh new file mode 100755 index 0000000..be046df --- /dev/null +++ b/.travis/call-creation.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +curl -sS "http://local.v3.bdn.parabot.org:88/api/bot/create/client?build_id=$TRAVIS_BUILD_ID&version=2.5.1" \ No newline at end of file From ee89232f57b514de67177f1da0ee89480515b4c6 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 May 2016 20:01:29 +0200 Subject: [PATCH 03/22] [TASK] Applied sh script into travis config --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index d8a40cd..b4ed831 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,9 +6,12 @@ jdk: before_install: - chmod +x ./.travis/artifact-upload.sh - chmod +x ./.travis/maven-build.sh + - chmod +x ./.travis/call-creation.sh script: ./.travis/maven-build.sh +#after_script: ./.travis/call-creation.sh + notifications: email: false slack: From 8e8bf0d80e95f551656d3b3fc57e99443abec383 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 May 2016 20:07:47 +0200 Subject: [PATCH 04/22] [BUGFIX] Moved directory to target_paths --- .travis.yml | 2 +- pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index b4ed831..3fac66f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ addons: artifacts: paths: ./target/final/ s3_region: "us-west-1" - target_paths: ./artifacts/ + target_paths: ./artifacts/Parabot/ cache: directories: diff --git a/pom.xml b/pom.xml index 43ec66d..0662eba 100755 --- a/pom.xml +++ b/pom.xml @@ -121,7 +121,7 @@ org.parabot.Landing - ${project.build.directory}/final/${type.name}/ + ${project.build.directory}/final/ false From 1177e32ede22388f443ebefa7444209c9cc53acb Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 May 2016 20:10:22 +0200 Subject: [PATCH 05/22] [BUGFIX] Removed useless property --- pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/pom.xml b/pom.xml index 0662eba..cab79b8 100755 --- a/pom.xml +++ b/pom.xml @@ -12,7 +12,6 @@ 1.7 - Parabot From 122b9d459269c9fa6bfeb093c9454fe5b184f5eb Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Wed, 25 May 2016 20:12:19 +0200 Subject: [PATCH 06/22] [BUGFIX] Set Parabot to client --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3fac66f..8965155 100644 --- a/.travis.yml +++ b/.travis.yml @@ -33,7 +33,7 @@ addons: artifacts: paths: ./target/final/ s3_region: "us-west-1" - target_paths: ./artifacts/Parabot/ + target_paths: ./artifacts/client/ cache: directories: From 56a8e6c7aaae70f874e2cca0656248f3c7376346 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 18:17:39 +0200 Subject: [PATCH 07/22] [TASK] Set creation call url to live --- .travis/call-creation.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis/call-creation.sh b/.travis/call-creation.sh index be046df..e350ee1 100755 --- a/.travis/call-creation.sh +++ b/.travis/call-creation.sh @@ -1,3 +1,3 @@ #! /bin/sh -curl -sS "http://local.v3.bdn.parabot.org:88/api/bot/create/client?build_id=$TRAVIS_BUILD_ID&version=2.5.1" \ No newline at end of file +curl -sS "http://v3.bdn.parabot.org/api/bot/create/client?build_id=$TRAVIS_BUILD_ID&version=2.5.1" >/dev/null \ No newline at end of file From 0d68db706cb0f46239f03df616d88e0efe907e45 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 18:18:16 +0200 Subject: [PATCH 08/22] [TASK] Made call creation live --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8965155..044dd90 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: script: ./.travis/maven-build.sh -#after_script: ./.travis/call-creation.sh +after_script: ./.travis/call-creation.sh notifications: email: false From e0fef72354dfe78ed4b4694eb46ccc071178c66b Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 18:24:24 +0200 Subject: [PATCH 09/22] [BUGFIX] Set after_script to after_deploy --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 044dd90..eaf1f75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: script: ./.travis/maven-build.sh -after_script: ./.travis/call-creation.sh +after_deploy: ./.travis/call-creation.sh notifications: email: false From 4b5ca184558a02b515e1f877a5b54654b1e4d432 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 18:38:07 +0200 Subject: [PATCH 10/22] [BUGFIX] Proper workflow for uploading artifacts --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index eaf1f75..ea7a422 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,7 +10,7 @@ before_install: script: ./.travis/maven-build.sh -after_deploy: ./.travis/call-creation.sh +after_script: ./.travis/call-creation.sh notifications: email: false @@ -28,12 +28,9 @@ env: - secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE= - secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M= - secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM= + - "ARTIFACTS_AWS_REGION=us-west-1" -addons: - artifacts: - paths: ./target/final/ - s3_region: "us-west-1" - target_paths: ./artifacts/client/ +after_success: "travis-artifacts upload --path ./target/final/ --target-path ./artifacts/client/" cache: directories: From c5ce06374ff32704d30d3b389d08b6cc6be9435e Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 18:45:01 +0200 Subject: [PATCH 11/22] [BUGFIX] Added missing gem install --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ea7a422..f66520a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ before_install: - chmod +x ./.travis/artifact-upload.sh - chmod +x ./.travis/maven-build.sh - chmod +x ./.travis/call-creation.sh + - "gem install travis-artifacts" script: ./.travis/maven-build.sh @@ -28,7 +29,6 @@ env: - secure: UG+b1tEgc8xv9x4r//2OAIK1RrYv6n209KTTFMMwcnAa7DI8HaP8nljRa5/VhDhuKHdlVrYH/tI90v7UVBs0GDVNwK5V17Io0fMm3FUGZekSthTCqqno5wAGa9r6a6mMLtSaSmIFeIKi0+0d2ZwplRuhj/dtEYjjBBj+kK8g4nE= - secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M= - secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM= - - "ARTIFACTS_AWS_REGION=us-west-1" after_success: "travis-artifacts upload --path ./target/final/ --target-path ./artifacts/client/" From 52ca19686d1fbdf213b1605deb2923b32a81c18a Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:01:14 +0200 Subject: [PATCH 12/22] [BUGFIX] Changed system to deploy artifacts --- .travis.yml | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index f66520a..2d1982a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,17 +1,16 @@ language: java jdk: -- oraclejdk7 + - oraclejdk7 before_install: - chmod +x ./.travis/artifact-upload.sh - chmod +x ./.travis/maven-build.sh - chmod +x ./.travis/call-creation.sh - - "gem install travis-artifacts" -script: ./.travis/maven-build.sh +script: "./.travis/maven-build.sh" -after_script: ./.travis/call-creation.sh +after_deploy: "./.travis/call-creation.sh" notifications: email: false @@ -30,9 +29,20 @@ env: - secure: St/fecUDInFBCRriYqgp2F8PU9/SooorgxD9Mrs+b0EsC7AbtSsQXvdIv2Lp6xzdQ0VSXPcLIhULPOYrmBKnGQ/NjXTIZXxnroyQxxnI6xyEWIZwiHRY/bKRJDRbQTxD9NL32szKiDSwnw7pu6llF4D64UqQvziq4Gm6VohU75M= - secure: bD15GVZWowiknbfLavh8CxSh0GsnF5kT4kZ6ggCuUDGyj0mzqf7dNRnchQIKkCG0WRYyTrFN4pEiygeywWsipEeAVv9Xhx3cuUZmzeQaR5KCWabSwJ8gK6jZd1YhcWmM9vrdPHobZr65MP0y/8mu/Fovgky9dY7KDf4G3SebNrM= -after_success: "travis-artifacts upload --path ./target/final/ --target-path ./artifacts/client/" - cache: directories: - - .autoconf - - $HOME/.m2 + - ".autoconf" + - "$HOME/.m2" + +deploy: + provider: s3 + access_key_id: AKIAJDZLZNH2PIKHUKOA + secret_access_key: + secure: MTOqhji8t8DcGRsfZEitMTqMemqxIag4a3dI0SBeWKBMpDCcKOokhGbXFCUBvMukU6tKIFfMo15z2wERZQxCVAxMt7dr1cyuWb49Sdy+mnBR6Z3EsJ2suilBe6b+9odLJVplCQVRPz9VyKnllWwO9D5j/ZpQaf8fb1675PB6feY= + bucket: parabot + skip_cleanup: true + local-dir: "./target/final/" + upload-dir: "./artifacts/client/" + region: us-west-1 + on: + repo: Parabot/Parabot From 707d1ac7145c8c20a72a01a7e3b99f5056171940 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:06:09 +0200 Subject: [PATCH 13/22] [BUGFIX] Specified which branch may be deployed --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 2d1982a..13a9789 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,3 +46,4 @@ deploy: region: us-west-1 on: repo: Parabot/Parabot + all_branches: true From 90cd5906a3f45de5b0669849132d5f475c1d1399 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:23:43 +0200 Subject: [PATCH 14/22] [TASK] Added mvn clean --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 13a9789..8318dfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ before_install: - chmod +x ./.travis/artifact-upload.sh - chmod +x ./.travis/maven-build.sh - chmod +x ./.travis/call-creation.sh + - mvn clean script: "./.travis/maven-build.sh" @@ -44,6 +45,7 @@ deploy: local-dir: "./target/final/" upload-dir: "./artifacts/client/" region: us-west-1 + detect_encoding: true on: repo: Parabot/Parabot all_branches: true From d34d3fa2da3ea0d50eec5d710b762c11c177ac33 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:38:25 +0200 Subject: [PATCH 15/22] [BUGFIX] Maybe this helps building? --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 8318dfb..b70cb92 100644 --- a/.travis.yml +++ b/.travis.yml @@ -46,6 +46,7 @@ deploy: upload-dir: "./artifacts/client/" region: us-west-1 detect_encoding: true + acl: public_read on: repo: Parabot/Parabot all_branches: true From b8a1d72b4c50e40c07ba4749339ebdfc59a6df3b Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:48:57 +0200 Subject: [PATCH 16/22] [BUGFIX] This then? --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index b70cb92..d5bb168 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,6 @@ deploy: bucket: parabot skip_cleanup: true local-dir: "./target/final/" - upload-dir: "./artifacts/client/" region: us-west-1 detect_encoding: true acl: public_read From 8bfc496922df192ffcb8d96db5e7be8e1f395eb6 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:50:54 +0200 Subject: [PATCH 17/22] [BUGFIX] No need for ACL --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5bb168..33795f0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,7 +45,6 @@ deploy: local-dir: "./target/final/" region: us-west-1 detect_encoding: true - acl: public_read on: repo: Parabot/Parabot all_branches: true From 3b5bd118a7a7bf7e729d3d6573a0814f66309ecc Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:52:11 +0200 Subject: [PATCH 18/22] [TASK] Removed cleanup task --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 33795f0..5474c2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,7 +41,6 @@ deploy: secret_access_key: secure: MTOqhji8t8DcGRsfZEitMTqMemqxIag4a3dI0SBeWKBMpDCcKOokhGbXFCUBvMukU6tKIFfMo15z2wERZQxCVAxMt7dr1cyuWb49Sdy+mnBR6Z3EsJ2suilBe6b+9odLJVplCQVRPz9VyKnllWwO9D5j/ZpQaf8fb1675PB6feY= bucket: parabot - skip_cleanup: true local-dir: "./target/final/" region: us-west-1 detect_encoding: true From 1af05a02c2b923148baabd5b65d6bb7c76eb7864 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:54:42 +0200 Subject: [PATCH 19/22] [BUGFIX] Changed directory name --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 5474c2a..ae84e75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -41,9 +41,12 @@ deploy: secret_access_key: secure: MTOqhji8t8DcGRsfZEitMTqMemqxIag4a3dI0SBeWKBMpDCcKOokhGbXFCUBvMukU6tKIFfMo15z2wERZQxCVAxMt7dr1cyuWb49Sdy+mnBR6Z3EsJ2suilBe6b+9odLJVplCQVRPz9VyKnllWwO9D5j/ZpQaf8fb1675PB6feY= bucket: parabot + skip_cleanup: true local-dir: "./target/final/" + upload-dir: "artifacts/client/" region: us-west-1 detect_encoding: true + acl: public_read on: repo: Parabot/Parabot all_branches: true From f749319df85338a860eebc208988a23caa923456 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 19:57:42 +0200 Subject: [PATCH 20/22] [BUGFIX] Added trailing slash --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ae84e75..235431e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ deploy: bucket: parabot skip_cleanup: true local-dir: "./target/final/" - upload-dir: "artifacts/client/" + upload-dir: "/artifacts/client/" region: us-west-1 detect_encoding: true acl: public_read From c85d0654f09a725dbc755f886488a0dbf731ba86 Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 20:01:12 +0200 Subject: [PATCH 21/22] [BUGFIX] Set slashes correctly --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 235431e..25d2eb7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ deploy: bucket: parabot skip_cleanup: true local-dir: "./target/final/" - upload-dir: "/artifacts/client/" + upload-dir: "artifacts/client" region: us-west-1 detect_encoding: true acl: public_read From ed23b47c55c0866ef6be804606d12da91720066d Mon Sep 17 00:00:00 2001 From: JKetelaar Date: Thu, 26 May 2016 20:05:44 +0200 Subject: [PATCH 22/22] [BUGFIX] Added sleep of 15 seconds --- .travis/call-creation.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis/call-creation.sh b/.travis/call-creation.sh index e350ee1..1f1c916 100755 --- a/.travis/call-creation.sh +++ b/.travis/call-creation.sh @@ -1,3 +1,4 @@ #! /bin/sh +sleep 15 curl -sS "http://v3.bdn.parabot.org/api/bot/create/client?build_id=$TRAVIS_BUILD_ID&version=2.5.1" >/dev/null \ No newline at end of file