From e50a1e26e456332e5e8ec0ef6bdfa2fa8fd3b65f Mon Sep 17 00:00:00 2001 From: ljacqu Date: Tue, 30 Jan 2018 22:15:07 +0100 Subject: [PATCH 1/6] Update ISSUE_TEMPLATE.MD --- .github/ISSUE_TEMPLATE.MD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE.MD b/.github/ISSUE_TEMPLATE.MD index dce4b445..c8c99783 100644 --- a/.github/ISSUE_TEMPLATE.MD +++ b/.github/ISSUE_TEMPLATE.MD @@ -19,7 +19,7 @@ Standalone server/Bungeecord network, SQLite/MySql, ... This can be found by running `/authme version` ### Error Log: -Pastebin/Hastebin/Gist link of the error logo or stacktrace (if any) +Pastebin/Hastebin/Gist link of the error log or stacktrace (if any) ### Configuration: Pastebin/Hastebin/Gist link of your config.yml file (remember to delete any sensitive data) From e0e926354615dca377bb714e270c819612af4b86 Mon Sep 17 00:00:00 2001 From: sgdc3 Date: Wed, 31 Jan 2018 19:10:05 +0100 Subject: [PATCH 2/6] Remove travis, update circle ci config --- .travis.yml | 25 ------------------------- README.md | 1 - circle.yml | 14 +++++++------- pom.xml | 2 +- 4 files changed, 8 insertions(+), 34 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 56146b56..00000000 --- a/.travis.yml +++ /dev/null @@ -1,25 +0,0 @@ -sudo: required -addons: - apt: - packages: - - oracle-java8-installer - - git - -language: java -jdk: - - oraclejdk8 - - oraclejdk9 - -before_script: - - "sudo git clone https://www.github.com/P-H-C/phc-winner-argon2.git argon2-src" - - "cd argon2-src && sudo make && sudo make install && cd .." - -script: mvn clean verify -B - -notifications: - webhooks: - urls: - - https://webhooks.gitter.im/e/952357dbd9d3cea70fd5 - on_success: change # options: [always|never|change] default: always - on_failure: always # options: [always|never|change] default: always - on_start: false # default: false diff --git a/README.md b/README.md index 7a0994c1..ee54889d 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,6 @@ - CI Services: - [Official Jenkins](http://ci.xephi.fr/job/AuthMeReloaded) (**DEVELOPMENT BUILDS**) - - Travis CI: [![Travis CI](https://travis-ci.org/AuthMe/AuthMeReloaded.svg?branch=master)](https://travis-ci.org/AuthMe/AuthMeReloaded) - CircleCI: [![CircleCI](https://circleci.com/gh/AuthMe/AuthMeReloaded.svg?style=svg)](https://circleci.com/gh/AuthMe/AuthMeReloaded) - Project status: diff --git a/circle.yml b/circle.yml index 169726b8..d6d8fcbb 100644 --- a/circle.yml +++ b/circle.yml @@ -1,20 +1,20 @@ machine: java: version: oraclejdk8 + dependencies: pre: - "sudo apt-get update; sudo apt-get install -y git; sudo git clone https://www.github.com/P-H-C/phc-winner-argon2.git argon2-src; cd argon2-src; sudo make; sudo make install" -general: - artifacts: - - "target/AuthMe-*.jar" + override: + - mvn -DskipTests clean install dependency:resolve-plugins dependency:go-offline + test: override: - - mvn clean install -B + - mvn -o surefire:test post: - - cp ./target/AuthMe-*.jar $CIRCLE_ARTIFACTS - - cp ./target/AuthMe-*.jar $CIRCLE_ARTIFACTS/AuthMe.jar - mkdir -p $CIRCLE_TEST_REPORTS/junit/ - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; + notify: webhooks: - - url: https://webhooks.gitter.im/e/7b92ac1a1741748b26bf + - url: https://discordapp.com/api/webhooks/408312347388674048/Tv5q5C1Hyn-QnDis4GT0A2jlFtJ_n1Dw3R9LGIxLCNaZd7BuCKvPWIQSY-yHm9N_RCUi/slack diff --git a/pom.xml b/pom.xml index 4a5292ce..83bafa47 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ jenkins - http://ci.xephi.fr/job/AuthMeReloaded/ + http://ci.codemc.org/job/AuthMeReloaded/ From a1305073c1b10589495ef6b68621684fb5b46458 Mon Sep 17 00:00:00 2001 From: sgdc3 Date: Wed, 31 Jan 2018 19:31:54 +0100 Subject: [PATCH 3/6] Use circle 2.0 --- .circleci/circle.yml | 51 ++++++++++++++++++++++++++++++++++++++++++++ circle.yml | 20 ----------------- 2 files changed, 51 insertions(+), 20 deletions(-) create mode 100644 .circleci/circle.yml delete mode 100644 circle.yml diff --git a/.circleci/circle.yml b/.circleci/circle.yml new file mode 100644 index 00000000..a9342304 --- /dev/null +++ b/.circleci/circle.yml @@ -0,0 +1,51 @@ +version: 2 +jobs: + build_and_test_jdk8: + working_directory: ~/authmereloaded-jdk8 + docker: + - image: circleci/openjdk:8-jdk + environment: + MAVEN_OPTS: -Xmx2048m + steps: + - checkout + - restore_cache: + key: authmereloaded-{{ checksum "pom.xml" }} + - run: mvn -T 2 dependency:go-offline + - save_cache: + paths: + - ~/.m2 + key: authmereloaded-{{ checksum "pom.xml" }} + - run: mvn -T 2 package + - store_test_results: + path: target/surefire-reports + - store_artifacts: + path: target/*.jar + build_and_test_jdk9: + working_directory: ~/authmereloaded-jdk9 + docker: + - image: circleci/openjdk:9-jdk + environment: + MAVEN_OPTS: -Xmx2048m + steps: + - checkout + - restore_cache: + key: authmereloaded-{{ checksum "pom.xml" }} + - run: mvn -T 2 dependency:go-offline + - save_cache: + paths: + - ~/.m2 + key: authmereloaded-{{ checksum "pom.xml" }} + - run: mvn -T 2 package + - store_test_results: + path: target/surefire-reports + - store_artifacts: + path: target/*.jar +workflows: + version: 2 + build_and_test: + jobs: + - build_and_test_jdk8 + - build_and_test_jdk9 +notify: + webhooks: + - url: https://discordapp.com/api/webhooks/408312347388674048/Tv5q5C1Hyn-QnDis4GT0A2jlFtJ_n1Dw3R9LGIxLCNaZd7BuCKvPWIQSY-yHm9N_RCUi/slack diff --git a/circle.yml b/circle.yml deleted file mode 100644 index d6d8fcbb..00000000 --- a/circle.yml +++ /dev/null @@ -1,20 +0,0 @@ -machine: - java: - version: oraclejdk8 - -dependencies: - pre: - - "sudo apt-get update; sudo apt-get install -y git; sudo git clone https://www.github.com/P-H-C/phc-winner-argon2.git argon2-src; cd argon2-src; sudo make; sudo make install" - override: - - mvn -DskipTests clean install dependency:resolve-plugins dependency:go-offline - -test: - override: - - mvn -o surefire:test - post: - - mkdir -p $CIRCLE_TEST_REPORTS/junit/ - - find . -type f -regex ".*/target/surefire-reports/.*xml" -exec cp {} $CIRCLE_TEST_REPORTS/junit/ \; - -notify: - webhooks: - - url: https://discordapp.com/api/webhooks/408312347388674048/Tv5q5C1Hyn-QnDis4GT0A2jlFtJ_n1Dw3R9LGIxLCNaZd7BuCKvPWIQSY-yHm9N_RCUi/slack From bdb954649e0829a703245c8d14f498811669e469 Mon Sep 17 00:00:00 2001 From: sgdc3 Date: Wed, 31 Jan 2018 19:39:15 +0100 Subject: [PATCH 4/6] Fix circle ci artifacts --- .circleci/circle.yml | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.circleci/circle.yml b/.circleci/circle.yml index a9342304..7b70a191 100644 --- a/.circleci/circle.yml +++ b/.circleci/circle.yml @@ -38,14 +38,10 @@ jobs: - run: mvn -T 2 package - store_test_results: path: target/surefire-reports - - store_artifacts: - path: target/*.jar + - run: cp ./target/*.jar $CIRCLE_ARTIFACTS workflows: version: 2 build_and_test: jobs: - build_and_test_jdk8 - build_and_test_jdk9 -notify: - webhooks: - - url: https://discordapp.com/api/webhooks/408312347388674048/Tv5q5C1Hyn-QnDis4GT0A2jlFtJ_n1Dw3R9LGIxLCNaZd7BuCKvPWIQSY-yHm9N_RCUi/slack From a0080686ac8dcf255baac6ead7c619f5cf3a8bc3 Mon Sep 17 00:00:00 2001 From: sgdc3 Date: Wed, 31 Jan 2018 19:49:03 +0100 Subject: [PATCH 5/6] Reuse old circle caches --- .circleci/circle.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.circleci/circle.yml b/.circleci/circle.yml index 7b70a191..cb1e2ba6 100644 --- a/.circleci/circle.yml +++ b/.circleci/circle.yml @@ -9,7 +9,9 @@ jobs: steps: - checkout - restore_cache: - key: authmereloaded-{{ checksum "pom.xml" }} + keys: + - authmereloaded-{{ checksum "pom.xml" }} + - authmereloaded- - run: mvn -T 2 dependency:go-offline - save_cache: paths: From 74c06346d8b8fe31cd77c6eab3f5c71e0c3bdf1a Mon Sep 17 00:00:00 2001 From: sgdc3 Date: Wed, 31 Jan 2018 21:43:55 +0100 Subject: [PATCH 6/6] Eureka, found a better solution to deploy the non shaded jar as default artifact! --- pom.xml | 51 +++++++-------------------------------------------- 1 file changed, 7 insertions(+), 44 deletions(-) diff --git a/pom.xml b/pom.xml index 83bafa47..b508bfa1 100644 --- a/pom.xml +++ b/pom.xml @@ -106,7 +106,7 @@ clean install - ${project.outputName}-${project.version} + ${project.outputName}-${project.version}-noshade @@ -197,6 +197,7 @@ + ${project.outputName}-${project.version} public false @@ -213,6 +214,9 @@ + + ${project.outputName}-${project.version} + org.apache.maven.plugins @@ -228,6 +232,8 @@ false + true + ${project.outputName}-${project.version} - ${project.distributionManagement.snapshotRepository.id} - ${project.distributionManagement.snapshotRepository.url} - pom.xml - target/original-${project.build.finalName}.jar - - org.eluder.coveralls