Skip to content
This repository has been archived by the owner on Apr 28, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/7397'
Browse files Browse the repository at this point in the history
  • Loading branch information
weierophinney committed May 6, 2015
6 parents 4bbbc2f + 5415db9 + 72b9fa4 + 7751a3c + 8890b01 + 25061cf commit 8755919
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ php:

install:
- if [[ $TRAVIS_PHP_VERSION != '5.6' && $TRAVIS_PHP_VERSION != 'hhvm' && $TRAVIS_PHP_VERSION != 'hhvm-nightly' && $TRAVIS_PHP_VERSION != '7' ]]; then phpenv config-rm xdebug.ini; fi
- sudo apt-get install parallel libpcre3-dev
- sudo apt-get install parallel
- composer install --no-interaction --prefer-source

before_script:
- php --version
- cp tests/TestConfiguration.php.travis tests/TestConfiguration.php
- if [[ $TRAVIS_PHP_VERSION = '5.6' ]]; then mkdir -p build/coverage; fi

Expand Down

0 comments on commit 8755919

Please sign in to comment.