Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/QA_4_5' into QA_4_5
Browse files Browse the repository at this point in the history
  • Loading branch information
weblate committed Jan 26, 2016
2 parents df61ec1 + 9ca4b34 commit 428b74d
Showing 1 changed file with 1 addition and 16 deletions.
17 changes: 1 addition & 16 deletions .travis.yml
Expand Up @@ -9,8 +9,7 @@ php:
- "7.0"
- "5.6"
- "5.5"
- hhvm
- nightly
- "hhvm"

sudo: false

Expand Down Expand Up @@ -52,20 +51,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/
Expand Down

0 comments on commit 428b74d

Please sign in to comment.