Merge branch '1.1' into 1.2

This commit is contained in:
Robbie Averill 2017-09-08 14:46:50 +12:00
commit f0b762cd0d
1 changed files with 10 additions and 14 deletions

View File

@ -1,4 +1,4 @@
# See https://github.com/silverstripe-labs/silverstripe-travis-support for setup details # See https://github.com/silverstripe/silverstripe-travis-support for setup details
language: php language: php
@ -10,27 +10,23 @@ php:
- 5.4 - 5.4
env: env:
- DB=MYSQL CORE_RELEASE=3.2 - DB=MYSQL CORE_RELEASE=3.5
matrix: matrix:
include: include:
- php: 5.3 - php: 5.3
env: DB=PGSQL CORE_RELEASE=3.2 env: DB=PGSQL CORE_RELEASE=3.4
- php: 5.6 - php: 5.6
env: DB=MYSQL CORE_RELEASE=3 env: DB=MYSQL CORE_RELEASE=3
- php: 5.4 - php: 5.4
env: DB=MYSQL CORE_RELEASE=3.2 BEHAT_TEST=1 env: DB=MYSQL CORE_RELEASE=3.6
before_script: before_script:
- composer self-update - composer self-update || true
- phpenv rehash - git clone git://github.com/silverstripe/silverstripe-travis-support.git ~/travis-support
- git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss
- "if [ \"$BEHAT_TEST\" = \"\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss; fi" - cd ~/builds/ss
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require silverstripe/behat-extension; fi" - composer install
- cd ~/builds/ss
- php ~/travis-support/travis_setup_selenium.php --if-env BEHAT_TEST
- php ~/travis-support/travis_setup_php54_webserver.php --if-env BEHAT_TEST
script: script:
- "if [ \"$BEHAT_TEST\" = \"\" ]; then vendor/bin/phpunit subsites/tests; fi" - vendor/bin/phpunit subsites/tests
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then vendor/bin/behat @subsites; fi"