Commit aec4faf2 authored by Marco Pivetta's avatar Marco Pivetta Committed by GitHub

Merge pull request #2629 from photodude/patch-4

HHVM testing needs to be in PHP 7 mode
parents cc1e9a90 b4100118
...@@ -221,7 +221,7 @@ matrix: ...@@ -221,7 +221,7 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.4 env: DB=pgsql POSTGRESQL_VERSION=9.4
- php: hhvm - php: hhvm
sudo: false sudo: true
dist: trusty dist: trusty
addons: addons:
postgresql: "9.5" postgresql: "9.5"
...@@ -229,7 +229,7 @@ matrix: ...@@ -229,7 +229,7 @@ matrix:
- postgresql - postgresql
env: DB=pgsql POSTGRESQL_VERSION=9.5 env: DB=pgsql POSTGRESQL_VERSION=9.5
- php: hhvm - php: hhvm
sudo: false sudo: true
dist: trusty dist: trusty
addons: addons:
postgresql: "9.6" postgresql: "9.6"
...@@ -256,6 +256,10 @@ matrix: ...@@ -256,6 +256,10 @@ matrix:
- php: 7.1 - php: 7.1
env: DB=pgsql POSTGRESQL_VERSION=9.6 env: DB=pgsql POSTGRESQL_VERSION=9.6
before_install:
# Force hhvm PHP 7 mode
- if [[ $TRAVIS_PHP_VERSION = hhv* ]]; then echo hhvm.php7.all=1 >> /etc/hhvm/php.ini; fi
install: install:
- travis_retry composer install - travis_retry composer install
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment