Merge branch 'MAINT_4_5_4' into QA_4_5
This commit is contained in:
commit
d21ce68c60
16
.travis.yml
16
.travis.yml
@ -9,8 +9,6 @@ php:
|
||||
- "7.0"
|
||||
- "5.6"
|
||||
- "5.5"
|
||||
- hhvm
|
||||
- nightly
|
||||
|
||||
sudo: false
|
||||
|
||||
@ -52,20 +50,6 @@ after_script:
|
||||
- if [ -f vendor/bin/coveralls ] ; then php vendor/bin/coveralls -v || true ; fi
|
||||
- if [ -f php.log ] ; then cat php.log ; fi
|
||||
|
||||
matrix:
|
||||
allow_failures:
|
||||
- php: 5.6
|
||||
env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes"
|
||||
- php: hhvm
|
||||
env: PHPUNIT_ARGS="--exclude-group selenium"
|
||||
- php: nightly
|
||||
env: PHPUNIT_ARGS="--exclude-group selenium"
|
||||
- php: "7.0"
|
||||
env: PHPUNIT_ARGS="--exclude-group selenium"
|
||||
fast_finish: true
|
||||
include:
|
||||
- php: 5.6
|
||||
env: PHPUNIT_ARGS="--group selenium" SELENIUM="yes"
|
||||
cache:
|
||||
directories:
|
||||
- $HOME/.composer/cache/
|
||||
|
||||
Loading…
Reference in New Issue
Block a user