diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 56146b568..000000000 --- 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 7a0994c1c..ee54889dc 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 169726b8a..d6d8fcbbc 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 4a5292ce8..83bafa471 100644 --- a/pom.xml +++ b/pom.xml @@ -27,7 +27,7 @@ jenkins - http://ci.xephi.fr/job/AuthMeReloaded/ + http://ci.codemc.org/job/AuthMeReloaded/