kemitix/kemitix-checkstyle-ruleset
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into upgrade-checkstyle

Browse source 
* develop:
  KCR29: travis-ci: detect Travis-CI
  KCR29: travis-ci: dump $TRAVIS and other env
  KCR29: travis-ci: should only submit coverage report from Travis-CI
  KCR29: builder: Rule: sortByName(): use explicit scoping
This commit is contained in:
Paul Campbell 2017-05-29 12:11:29 +01:00
commit 68b2f0456c
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
builder/src/main/java/net/kemitix/checkstyle/ruleset/builder/Rule.java
View file

@ -95,7 +95,7 @@ public class Rule {
* the right string; and a value greater than 0 if the left string is lexicographically greater than the right
* string.
*/
static int sortByName(final Rule left, final Rule right) {
protected static int sortByName(final Rule left, final Rule right) {
return left.getLowerCaseRuleName()
.compareTo(right.getLowerCaseRuleName());
}

6
travis-ci/travis-coveralls-report.sh
View file

@ -1,3 +1,7 @@
#!/usr/bin/env bash
./mvnw --projects builder,plugin test jacoco:report coveralls:report
## Only send coveralls reports from Travis-CI. Some CIs, like Shippable, lie by setting TRAVIS=true.
## Currently, Shippable, does not set TRAVIS_LANGUAGE, but Travis-CI does.
if [ "$TRAVIS_LANGUAGE" = "java" ];then
./mvnw --projects builder,plugin test jacoco:report coveralls:report
fi