diff options
| -rw-r--r-- | .travis.yml | 47 | ||||
| -rwxr-xr-x | travis/setup-webserver.sh | 4 |
2 files changed, 25 insertions, 26 deletions
diff --git a/.travis.yml b/.travis.yml index ae5afc33d7..0ac1464540 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,30 @@ language: php -php: - - 5.3.3 - - 5.3 - - 5.4 - - 5.5 - - 5.6 - - hhvm -env: - - DB=mysqli +matrix: + include: + - php: 5.3.3 + env: DB=mysqli + - php: 5.3 + env: DB=mysqli # MyISAM + - php: 5.4 + env: DB=mysqli + - php: 5.4 + env: DB=mysql + - php: 5.4 + env: DB=mariadb + - php: 5.4 + env: DB=postgres + - php: 5.4 + env: DB=sqlite3 + - php: 5.5 + env: DB=mysqli + - php: 5.6 + env: DB=mysqli + - php: hhvm + env: DB=mysql + allow_failures: + - php: hhvm + fast_finish: true services: - redis-server @@ -24,16 +40,3 @@ script: - phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysqli' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" -matrix: - include: - - php: 5.4 - env: DB=mysql - - php: 5.4 - env: DB=mariadb - - php: 5.4 - env: DB=postgres - - php: 5.4 - env: DB=sqlite3 - allow_failures: - - php: hhvm - fast_finish: true diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 6188d2c232..bffe2c0bf4 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -28,10 +28,6 @@ then # Upgrade to a recent stable version of HHVM sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm-nightly - # MySQLi is broken in HHVM 3.0.0~precise and still does not work for us in - # 2014.03.28~saucy, i.e. needs more work. Use MySQL extension for now. - sed -i "s/mysqli/mysql/" "$DIR/phpunit-mysql-travis.xml" - HHVM_LOG=$(realpath "$DIR")/hhvm.log sudo hhvm \ |