diff options
| author | brantje <brantje@gmail.com> | 2016-10-08 02:49:33 +0300 |
|---|---|---|
| committer | brantje <brantje@gmail.com> | 2016-10-08 02:49:33 +0300 |
| commit | 7e776b4fabe6181815744fc3bc1bf1506001eeb6 (patch) | |
| tree | d6aafe38853c6c7be07e7e315350f7e5a7e808a4 /.travis.yml | |
| parent | d50810eba04ba1f812cf73da3816d3d7f182d129 (diff) | |
Update travis..
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 552912f3..65ac8ec2 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 |