Merge branch '4.0' of github.com:silverstripe/silverstripe-installer into 4

This commit is contained in:
Christopher Joe 2017-12-21 13:40:09 +13:00
commit decd8bb446

View File

@ -2,6 +2,8 @@ language: php
dist: trusty dist: trusty
sudo: required
group: deprecated-2017Q4 group: deprecated-2017Q4
cache: cache:
@ -45,15 +47,15 @@ matrix:
- DB=MYSQL - DB=MYSQL
- PDO=1 - PDO=1
# behat tests # behat tests
- php: 5.6 - php: 7.0
env: env:
- BEHAT_TEST="@framework" - BEHAT_TEST="@framework"
- DB=MYSQL - DB=MYSQL
- php: 5.6 - php: 7.0
env: env:
- BEHAT_TEST="@cms" - BEHAT_TEST="@cms"
- DB=MYSQL - DB=MYSQL
- php: 5.6 - php: 7.0
env: env:
- BEHAT_TEST="@asset-admin" - BEHAT_TEST="@asset-admin"
- DB=MYSQL - DB=MYSQL
@ -76,14 +78,14 @@ before_script:
- if [[ $BEHAT_TEST ]]; then cp composer.lock artifacts/; fi - if [[ $BEHAT_TEST ]]; then cp composer.lock artifacts/; fi
- if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi - if [[ $BEHAT_TEST ]]; then sh -e /etc/init.d/xvfb start; sleep 3; fi
- if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi - if [[ $BEHAT_TEST ]]; then (vendor/bin/selenium-server-standalone > artifacts/selenium.log 2>&1 &); fi
- if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi - if [[ $BEHAT_TEST ]]; then (vendor/bin/serve --bootstrap-file vendor/silverstripe/cms/tests/behat/serve-bootstrap.php &> artifacts/serve.log &); fi
script: script:
- if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit --testsuite $PHPUNIT_TEST; fi - if [[ $PHPUNIT_TEST ]]; then vendor/bin/phpunit --testsuite $PHPUNIT_TEST; fi
- if [[ $BEHAT_TEST ]]; then vendor/bin/behat $BEHAT_TEST; fi - if [[ $BEHAT_TEST ]]; then vendor/bin/behat $BEHAT_TEST; fi
after_failure: after_failure:
- if [[ $BEHAT_TEST ]]; then php ./framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi - if [[ $BEHAT_TEST ]]; then php ./vendor/silverstripe/framework/tests/behat/travis-upload-artifacts.php --if-env BEHAT_TEST,ARTIFACTS_BUCKET,ARTIFACTS_KEY,ARTIFACTS_SECRET --target-path $TRAVIS_REPO_SLUG/$TRAVIS_BUILD_ID/$TRAVIS_JOB_ID --artifacts-base-url https://s3.amazonaws.com/$ARTIFACTS_BUCKET/ --artifacts-path ./artifacts/; fi
notifications: notifications:
slack: silverstripeltd:Cls1xnypKBLFhv0YIRtNLzlQ slack: silverstripeltd:Cls1xnypKBLFhv0YIRtNLzlQ