Permalink
Browse files

Separate PHPCS run on travis, don't fail whole build for it

  • Loading branch information...
1 parent 681a024 commit 90084bb708075162c1ae2e01994bae1a53501149 @chillu chillu committed Dec 14, 2012
Showing with 8 additions and 5 deletions.
  1. +8 −5 .travis.yml
View
@@ -13,8 +13,15 @@ matrix:
env: TESTDB=PGSQL
- php: 5.4
env: TESTDB=SQLITE
+ include:
+ - php: 5.4
+ env:
+ - PHPCS=1
allow_failures:
- env: TESTDB=PGSQL
+ - php: 5.4
+ env:
+ - PHPCS=1
before_script:
- pear install pear/PHP_CodeSniffer
@@ -23,17 +30,13 @@ before_script:
- cd ~/builds/ss
script:
- - phpunit -c phpunit.xml.dist
- - phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs/ruleset.xml -np framework
- - phpcs --encoding=utf-8 --standard=framework/tests/phpcs/tabs.xml -np framework
+ - sh -c "if [ '$PHPCS' != '1' ]; then phpunit -c phpunit.xml.dist; else phpcs --encoding=utf-8 --tab-width=4 --standard=framework/tests/phpcs/ruleset.xml -np framework && phpcs --encoding=utf-8 --standard=framework/tests/phpcs/tabs.xml -np framework; fi"
branches:
except:
- 2.1
- 2.2
- 2.3
- - 2.4
- - post-2.4
- translation-staging
notifications:

0 comments on commit 90084bb

Please sign in to comment.