mirror of
https://github.com/AuthMe/AuthMeReloaded.git
synced 2024-09-07 04:38:03 +02:00
Merge branch 'master' of https://github.com/AuthMe/AuthMeReloaded into 1467-message-keys-hierarchy
This commit is contained in:
commit
b72fe1b1a9
49
.circleci/circle.yml
Normal file
49
.circleci/circle.yml
Normal file
@ -0,0 +1,49 @@
|
||||
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:
|
||||
keys:
|
||||
- authmereloaded-{{ checksum "pom.xml" }}
|
||||
- authmereloaded-
|
||||
- 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
|
||||
- run: cp ./target/*.jar $CIRCLE_ARTIFACTS
|
||||
workflows:
|
||||
version: 2
|
||||
build_and_test:
|
||||
jobs:
|
||||
- build_and_test_jdk8
|
||||
- build_and_test_jdk9
|
2
.github/ISSUE_TEMPLATE.MD
vendored
2
.github/ISSUE_TEMPLATE.MD
vendored
@ -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)
|
||||
|
25
.travis.yml
25
.travis.yml
@ -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
|
@ -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:
|
||||
|
20
circle.yml
20
circle.yml
@ -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"
|
||||
general:
|
||||
artifacts:
|
||||
- "target/AuthMe-*.jar"
|
||||
test:
|
||||
override:
|
||||
- mvn clean install -B
|
||||
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
|
53
pom.xml
53
pom.xml
@ -27,7 +27,7 @@
|
||||
|
||||
<ciManagement>
|
||||
<system>jenkins</system>
|
||||
<url>http://ci.xephi.fr/job/AuthMeReloaded/</url>
|
||||
<url>http://ci.codemc.org/job/AuthMeReloaded/</url>
|
||||
</ciManagement>
|
||||
|
||||
<issueManagement>
|
||||
@ -106,7 +106,7 @@
|
||||
|
||||
<build>
|
||||
<defaultGoal>clean install</defaultGoal>
|
||||
<finalName>${project.outputName}-${project.version}</finalName>
|
||||
<finalName>${project.outputName}-${project.version}-noshade</finalName>
|
||||
|
||||
<resources>
|
||||
<resource>
|
||||
@ -197,6 +197,7 @@
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<finalName>${project.outputName}-${project.version}</finalName>
|
||||
<show>public</show>
|
||||
<failOnError>false</failOnError>
|
||||
</configuration>
|
||||
@ -213,6 +214,9 @@
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<finalName>${project.outputName}-${project.version}</finalName>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
@ -228,6 +232,8 @@
|
||||
</executions>
|
||||
<configuration>
|
||||
<createDependencyReducedPom>false</createDependencyReducedPom>
|
||||
<shadedArtifactAttached>true</shadedArtifactAttached>
|
||||
<finalName>${project.outputName}-${project.version}</finalName>
|
||||
|
||||
<!--
|
||||
Relocate all lib we use in order to fix class loading errors if we use different versions
|
||||
@ -287,54 +293,11 @@
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-install</id>
|
||||
<phase>none</phase>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>install-custom</id>
|
||||
<phase>install</phase>
|
||||
<goals>
|
||||
<goal>install-file</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<pomFile>pom.xml</pomFile>
|
||||
<file>target/original-${project.build.finalName}.jar</file>
|
||||
<javadoc>target/${project.build.finalName}-javadoc.jar</javadoc>
|
||||
<sources>target/${project.build.finalName}-sources.jar</sources>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>default-deploy</id>
|
||||
<phase>none</phase>
|
||||
</execution>
|
||||
<execution>
|
||||
<id>deploy-custom</id>
|
||||
<phase>deploy</phase>
|
||||
<goals>
|
||||
<goal>deploy-file</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<!-- TODO: find a solution to detect release/snapshot -->
|
||||
<repositoryId>${project.distributionManagement.snapshotRepository.id}</repositoryId>
|
||||
<url>${project.distributionManagement.snapshotRepository.url}</url>
|
||||
<pomFile>pom.xml</pomFile>
|
||||
<file>target/original-${project.build.finalName}.jar</file>
|
||||
<!-- Already included by the plugin
|
||||
<javadoc>target/${project.build.finalName}-javadoc.jar</javadoc>
|
||||
<sources>target/${project.build.finalName}-sources.jar</sources>
|
||||
-->
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.eluder.coveralls</groupId>
|
||||
|
Loading…
Reference in New Issue
Block a user