From 48dcbe9d354575a973ad27987bb4d6e0ad8481b2 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Fri, 9 Sep 2016 15:18:48 -0600 Subject: [PATCH 1/8] As of HHVM 3.15 pgsql is supported --- .travis.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5a9fb2dcb..8f1ccf1f2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -52,9 +52,6 @@ matrix: env: DB=mariadb addons: mariadb: 10.1 - exclude: - - php: hhvm - env: DB=pgsql # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency allow_failures: - php: nightly From d7a0ed0611077d46fc3e1b8573ed7956cfc91e03 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Fri, 9 Sep 2016 15:35:33 -0600 Subject: [PATCH 2/8] pin to HHVM 3.15 and add PHP 7.1 Stop testing against old HHVM 3.9 and test against current LTS 3.15 --- .travis.yml | 47 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 44 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8f1ccf1f2..ba3e61bfb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ language: php php: - 5.6 - 7.0 + - 7.1 - nightly - - hhvm env: - DB=mysql @@ -27,6 +27,32 @@ after_script: matrix: include: + - php: hhvm-3.15 + sudo: true + dist: trusty + group: edge # until the next update + addons: + apt: + packages: + - mysql-server-5.6 + - mysql-client-core-5.6 + - mysql-client-5.6 + services: + - mysql + env: DB=mysql + - php: hhvm-3.15 + sudo: true + dist: trusty + group: edge # until the next update + services: + - postgresql + env: DB=pgsql + - php: hhvm-3.15 + sudo: true + dist: trusty + group: edge # until the next update + env: DB=sqlite + - php: 5.6 env: DB=mariadb addons: @@ -35,10 +61,17 @@ matrix: env: DB=mariadb addons: mariadb: 5.5 - - php: hhvm + - php: 7.1 env: DB=mariadb addons: mariadb: 5.5 + - php: hhvm-3.15 + sudo: true + dist: trusty + group: edge # until the next Trusty update + addons: + mariadb: 5.5 + env: DB=mariadb - php: 5.6 env: DB=mariadb @@ -48,11 +81,19 @@ matrix: env: DB=mariadb addons: mariadb: 10.1 - - php: hhvm + - php: 7.1 env: DB=mariadb addons: mariadb: 10.1 + - php: hhvm-3.15 + sudo: true + dist: trusty + group: edge # until the next Trusty update + addons: + mariadb: 10.1 + env: DB=mariadb allow_failures: + - php: 7.1 - php: nightly sudo: false From e52ca954f0aa2190ab66ef7c89eac1a8b2d09234 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Fri, 9 Sep 2016 15:42:31 -0600 Subject: [PATCH 3/8] fixing the xdebug error with php 7.1, nightly and HHVM-3.15 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index ba3e61bfb..96dba18a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ env: before_script: - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover ./build/logs/clover.xml"; else PHPUNIT_FLAGS=""; fi - - if [[ $TRAVIS_PHP_VERSION != '7.0' && $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi + - if [[ $TRAVIS_PHP_VERSION -lt '7.0' && $TRAVIS_PHP_VERSION != 'hhv*' ]]; then phpenv config-rm xdebug.ini; fi - composer self-update - composer install --prefer-source From a879811b6c0b80031e6dbbf4137bed80c8f21482 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Fri, 9 Sep 2016 15:51:34 -0600 Subject: [PATCH 4/8] Fast finish to avoid waiting on allowed failures Also Allow HHVM 3.15 with pgsql to fail --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 96dba18a7..d497867df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -26,6 +26,7 @@ after_script: - if [[ $TRAVIS_PHP_VERSION = '7.0' && $DB = 'sqlite' ]]; then php ocular.phar code-coverage:upload --format=php-clover build/logs/clover.xml; fi matrix: + fast_finish: true include: - php: hhvm-3.15 sudo: true @@ -95,6 +96,8 @@ matrix: allow_failures: - php: 7.1 - php: nightly + - php: hhvm-3.15 + env: DB=pgsql sudo: false From fda2cd7d0e8fe4ebc1e7be6062e88349ba9d9995 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Fri, 9 Sep 2016 15:59:23 -0600 Subject: [PATCH 5/8] Set all HHVM-3.15 to allowed failure --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d497867df..a18cfd21a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,6 @@ matrix: - php: 7.1 - php: nightly - php: hhvm-3.15 - env: DB=pgsql sudo: false From 1f521d26f360c8d85fda29a8ea5a1763e4dd349e Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Fri, 9 Sep 2016 17:21:03 -0600 Subject: [PATCH 6/8] Set to HHVM latest (currently 3.15 until next release) Move sudo: false to the top line to be more clear about use of containers as default vs the trusty builds for HHVM --- .travis.yml | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/.travis.yml b/.travis.yml index a18cfd21a..f1963e0d2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ +sudo: false language: php php: @@ -28,7 +29,7 @@ after_script: matrix: fast_finish: true include: - - php: hhvm-3.15 + - php: hhvm sudo: true dist: trusty group: edge # until the next update @@ -41,14 +42,14 @@ matrix: services: - mysql env: DB=mysql - - php: hhvm-3.15 + - php: hhvm sudo: true dist: trusty group: edge # until the next update services: - postgresql env: DB=pgsql - - php: hhvm-3.15 + - php: hhvm sudo: true dist: trusty group: edge # until the next update @@ -66,7 +67,7 @@ matrix: env: DB=mariadb addons: mariadb: 5.5 - - php: hhvm-3.15 + - php: hhvm sudo: true dist: trusty group: edge # until the next Trusty update @@ -96,9 +97,7 @@ matrix: allow_failures: - php: 7.1 - php: nightly - - php: hhvm-3.15 - -sudo: false + - php: hhvm cache: directories: From 29f51b4a26780ece722029f6b6b1ac3e9ca618ef Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Fri, 9 Sep 2016 18:00:40 -0600 Subject: [PATCH 7/8] Remove the last hhvm3.15 tag --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f1963e0d2..7098ab84d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -87,7 +87,7 @@ matrix: env: DB=mariadb addons: mariadb: 10.1 - - php: hhvm-3.15 + - php: hhvm sudo: true dist: trusty group: edge # until the next Trusty update From 99d704ff45b1a5f000821e240785fb92a83f7f43 Mon Sep 17 00:00:00 2001 From: Walt Sorensen Date: Sat, 10 Sep 2016 12:15:25 -0600 Subject: [PATCH 8/8] Drop mariadb: 5.5 tests reorder matrix so all HHVM tests are at the bottom --- .travis.yml | 58 ++++++++++++++++++----------------------------------- 1 file changed, 19 insertions(+), 39 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7098ab84d..4c3b1c623 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,25 @@ after_script: matrix: fast_finish: true include: + - php: 5.6 + env: DB=mariadb + addons: + mariadb: 10.1 + - php: 7.0 + env: DB=mariadb + addons: + mariadb: 10.1 + - php: 7.1 + env: DB=mariadb + addons: + mariadb: 10.1 + - php: hhvm + sudo: true + dist: trusty + group: edge # until the next Trusty update + addons: + mariadb: 10.1 + env: DB=mariadb - php: hhvm sudo: true dist: trusty @@ -55,45 +74,6 @@ matrix: group: edge # until the next update env: DB=sqlite - - php: 5.6 - env: DB=mariadb - addons: - mariadb: 5.5 - - php: 7.0 - env: DB=mariadb - addons: - mariadb: 5.5 - - php: 7.1 - env: DB=mariadb - addons: - mariadb: 5.5 - - php: hhvm - sudo: true - dist: trusty - group: edge # until the next Trusty update - addons: - mariadb: 5.5 - env: DB=mariadb - - - php: 5.6 - env: DB=mariadb - addons: - mariadb: 10.1 - - php: 7.0 - env: DB=mariadb - addons: - mariadb: 10.1 - - php: 7.1 - env: DB=mariadb - addons: - mariadb: 10.1 - - php: hhvm - sudo: true - dist: trusty - group: edge # until the next Trusty update - addons: - mariadb: 10.1 - env: DB=mariadb allow_failures: - php: 7.1 - php: nightly