From 6f96a3ba51019ac21257004973dfde444d367794 Mon Sep 17 00:00:00 2001 From: brantje Date: Sat, 8 Oct 2016 01:31:36 +0200 Subject: [PATCH] Update travis --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index fd7dbcb4..9dd89f30 100644 --- a/.travis.yml +++ b/.travis.yml @@ -69,7 +69,7 @@ script: #- sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then wget https://scrutinizer-ci.com/ocular.phar; fi" #- sh -c "if [ '$JSTESTS' != '1' -a '$CODECHECK' != '1' -a '$CODECHECK' != '2' ]; then php ocular.phar code-coverage:upload --format=php-clover clover.xml; fi" #- cd ../ - - sh -c "if [ '$JSTESTS' == '1']; then grunt jshint; fi" + - sh -c "if [ '$JSTESTS' == '1' -a '$CODECHECK' = '1']; then grunt jshint; fi" #after_failure: @@ -89,7 +89,7 @@ matrix: - php: 5.6 env: DB=mysql;CODECHECK=2 - php: 5.6 - env: DB=mysql;JSTESTS=1 + env: DB=mysql;JSTESTS=1;CODECHECK=1 - php: 7.0 env: DB=mysql;CODECHECK=1 - php: 7.0