diff --git a/.ci/travis.sh b/.ci/travis.sh index 4c0e9c46b..30a20c53c 100755 --- a/.ci/travis.sh +++ b/.ci/travis.sh @@ -34,9 +34,11 @@ patch-diff-report-tool) checkstyle-tester-launch-groovy) checkout_from https://github.com/checkstyle/checkstyle cd .ci-temp/checkstyle + LOCAL_GIT_REPO=$(pwd) mvn --batch-mode clean install -Passembly cd ../../checkstyle-tester - groovy launch.groovy -l projects-for-travis.properties -c my_check.xml -i + groovy diff.groovy -r "$LOCAL_GIT_REPO" -l projects-for-travis.properties --patchConfig my_check.xml \ + --patchBranch master --mode single --allowExcludes ;; checkstyle-tester-diff-groovy-patch) diff --git a/appveyor.yml b/appveyor.yml index a5ce9b200..c0d677035 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -83,7 +83,7 @@ environment: CMD3: " && cd checkstyle && git checkout -b patch-branch" CMD4: " " CMD5: " && cd ..\\checkstyle-tester " - CMD6: " && groovy diff.groovy -l projects-for-travis.properties -c my_check.xml -b master -p patch-branch -r C:\\projects\\contribution\\checkstyle -i -s" + CMD6: " && groovy diff.groovy -l projects-for-travis.properties -c my_check.xml -b master -p patch-branch -r C:\\projects\\contribution\\checkstyle -s" - JAVA_HOME: C:\Program Files\Java\jdk1.8.0 DESC: "checkstyle-tester (diff.groovy with base and patch configs) on guava" CMD1: " git clone -q --depth=10 --branch=master " @@ -91,7 +91,7 @@ environment: CMD3: " && cd checkstyle && git checkout -b patch-branch" CMD4: " " CMD5: " && cd ..\\checkstyle-tester " - CMD6: " && groovy diff.groovy -l projects-for-travis.properties -bc my_check.xml -pc my_check.xml -b master -p patch-branch -r C:\\projects\\contribution\\checkstyle -i -s" + CMD6: " && groovy diff.groovy -l projects-for-travis.properties -bc my_check.xml -pc my_check.xml -b master -p patch-branch -r C:\\projects\\contribution\\checkstyle -s" build_script: - ps: >