Update travis configuration to use composer phpunit

Made PHP 5.6 an allowed failure
This commit is contained in:
Damian Mooyman 2014-05-05 09:23:20 +12:00
parent 36bb411277
commit b5214d25a1

View File

@ -26,6 +26,9 @@ matrix:
env: DB=MYSQL CORE_RELEASE=3.1 env: DB=MYSQL CORE_RELEASE=3.1
- php: 5.4 - php: 5.4
env: DB=MYSQL CORE_RELEASE=3.1 BEHAT_TEST=1 env: DB=MYSQL CORE_RELEASE=3.1 BEHAT_TEST=1
allow_failures:
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.1
before_script: before_script:
- composer self-update - composer self-update
@ -38,7 +41,7 @@ before_script:
- php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST - php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
script: script:
- "if [ \"$BEHAT_TEST\" = \"\" ]; then phpunit cms/tests; fi" - "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit cms/tests; fi"
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi" - "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @cms; fi"
after_failure: after_failure: