tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #1010 from tractorcow/pulls/3.1-travis

Browse Source 
Update travis configuration to use composer phpunit
This commit is contained in:
Hamish Friedlander 2014-05-05 14:43:45 +12:00
commit 1f4d9e449b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.travis.yml
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: