From 1994969764cd2729569247a4ac6e2e228da4962c Mon Sep 17 00:00:00 2001 From: Peter Schrammel Date: Fri, 9 Dec 2016 22:08:33 +0000 Subject: [PATCH 1/2] Do not try to run cpplint if no files have changed --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index cea814fd3c8..0dceb258a43 100644 --- a/.travis.yml +++ b/.travis.yml @@ -48,4 +48,4 @@ script: matrix: include: - env: NAME="CPP-LINT" - script: cd .. && python scripts/cpplint.py `git diff --name-only master HEAD` + script: cd .. && DIFF=`git diff --name-only master HEAD` && if [ "$DIFF" != "" ]; then python scripts/cpplint.py $DIFF; fi From 74afa680306a0d889179ffcbe632b86119a54615 Mon Sep 17 00:00:00 2001 From: Michael Tautschnig Date: Sun, 18 Dec 2016 17:44:24 +0000 Subject: [PATCH 2/2] travis cleanup: no need for install target This should re-enable linting as a parallel, separate task. --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0dceb258a43..51999590a93 100644 --- a/.travis.yml +++ b/.travis.yml @@ -38,14 +38,11 @@ addons: packages: - libwww-perl -install: - - chmod a+x regression/failed-tests-printer.pl - - cd src && make minisat2-download - script: - - make CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 && cd ../regression && make test + - make -C src minisat2-download + - make -C src CXXFLAGS="-Wall -O2 -g -Werror -Wno-deprecated-register -pedantic -Wno-sign-compare" -j2 && make -C regression test matrix: include: - env: NAME="CPP-LINT" - script: cd .. && DIFF=`git diff --name-only master HEAD` && if [ "$DIFF" != "" ]; then python scripts/cpplint.py $DIFF; fi + script: DIFF=`git diff --name-only master HEAD` && if [ "$DIFF" != "" ]; then python scripts/cpplint.py $DIFF; fi