Merge branch '2.5' into 2

This commit is contained in:
Robbie Averill 2019-07-24 12:43:28 +02:00
commit faa93b9845
2 changed files with 14 additions and 45 deletions

View File

@ -1,45 +1,26 @@
language: php language: php
sudo: false dist: trusty
dist: precise
addons: addons:
apt: apt:
packages: packages:
- tidy - tidy
before_install:
- pip install --user codecov
env:
global:
- DB=MYSQL CORE_RELEASE=3.6
# Turn coverage off by default, as it's expensive time wise
- COVERAGE=0
# The path of the module when installed by composer
- MODULE_PATH=blog
matrix: matrix:
include: include:
- php: 5.6 - php: '5.6'
env: DB=MYSQL COVERAGE=1
- php: 5.5
env: DB=MYSQL CORE_RELEASE=3.2
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.3
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.4
- php: 5.6
env: DB=PGSQL CORE_RELEASE=3.5
- php: 5.4
env: DB=SQLITE
- php: 5.4
env: DB=MYSQL
- php: 7.1
env: DB=MYSQL CORE_RELEASE=3.6 env: DB=MYSQL CORE_RELEASE=3.6
- php: '7.0'
env: DB=MYSQL CORE_RELEASE=3.7
- php: '7.1'
env: DB=PGSQL CORE_RELEASE=3.7
- php: '7.1'
env: DB=MYSQL CORE_RELEASE=3.7
- php: '7.2'
env: DB=PGSQL CORE_RELEASE=3.7
- php: '7.3'
env: DB=MYSQL CORE_RELEASE=3.7
before_script: before_script:
@ -49,17 +30,5 @@ before_script:
- php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require "silverstripe/comments" --require "silverstripe/widgets" - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss --require "silverstripe/comments" --require "silverstripe/widgets"
- cd ~/builds/ss - cd ~/builds/ss
#Execute tests with or without coverage
script: script:
# Execute tests with no coverage. This is the fastest option - vendor/bin/phpunit blog/tests
- "if [ \"$COVERAGE\" = \"0\" ]; then vendor/bin/phpunit $MODULE_PATH/tests/; fi"
# Execute tests with coverage. Do this for a small
- "if [ \"$COVERAGE\" = \"1\" ]; then vendor/bin/phpunit --coverage-clover=coverage.clover $MODULE_PATH/tests/; fi"
#Upload coverage even if there is a failure
after_script:
- "if [ \"$COVERAGE\" = \"1\" ]; then mv coverage.clover ~/build/$TRAVIS_REPO_SLUG/; fi"
- cd ~/build/$TRAVIS_REPO_SLUG
- wget https://scrutinizer-ci.com/ocular.phar
- "if [ \"$COVERAGE\" = \"1\" ]; then travis_retry codecov && travis_retry php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi"

View File

@ -13,7 +13,7 @@
"silverstripe/tagfield": "^1.0" "silverstripe/tagfield": "^1.0"
}, },
"require-dev": { "require-dev": {
"phpunit/PHPUnit": "~3.7@stable" "phpunit/phpunit": "^5.7"
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {