From: Jeremy Benoist <j0k3r@users.noreply.github.com>
Date: Wed, 17 Aug 2016 16:00:17 +0000 (+0200)
Subject: Merge pull request #2134 from wallabag/hhvm
X-Git-Tag: 2.0.7~6
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=b762ab3cceecfbe50443a6bf35e2ce8c71021d49;hp=782390a80effe3dbf7071de137e026067b116c93;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #2134 from wallabag/hhvm

Run tests on an uptodate HHVM
---

diff --git a/.travis.yml b/.travis.yml
index a387fc13..73f9491a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -22,7 +22,6 @@ php:
     - 7.0
     - 7.1
     - nightly
-    - hhvm
 
 env:
     - DB=mysql
@@ -32,13 +31,29 @@ env:
 matrix:
     fast_finish: true
     include:
+        # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
+        - php: hhvm-3.12
+          sudo: required
+          dist: trusty
+          group: edge
+          env: DB=mysql
+          addons:
+            apt:
+                packages:
+                    - mysql-server-5.6
+                    - mysql-client-core-5.6
+                    - mysql-client-5.6
+          services:
+            - mysql
+        - php: hhvm-3.12
+          sudo: required
+          dist: trusty
+          group: edge
+          env: DB=sqlite
         - php: 7.0
           env: CS_FIXER=run VALIDATE_TRANSLATION_FILE=run DB=sqlite
-    exclude:
-        - php: hhvm
-          env: DB=pgsql  # driver for PostgreSQL currently unsupported by HHVM, requires 3rd party dependency
     allow_failures:
-        - php: hhvm
+        - php: hhvm-3.12
         - php: nightly
 
 # exclude v1 branches
@@ -47,9 +62,10 @@ branches:
         - legacy
 
 before_script:
-    - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
+    - PHP=$TRAVIS_PHP_VERSION
+    - if [[ ! $PHP = hhvm* ]]; then echo "memory_limit=-1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini; fi;
     # xdebug isn't enable for PHP 7.1
-    - if [[ $TRAVIS_PHP_VERSION != '7.1' && $TRAVIS_PHP_VERSION != 'hhvm' ]]; then phpenv config-rm xdebug.ini; fi
+    - if [[ ! $PHP = hhvm* ]]; then phpenv config-rm xdebug.ini || echo "xdebug not available"; fi
     - composer self-update --no-progress
     - if [[ "$DB" = "pgsql" ]]; then psql -c 'create database wallabag_test;' -U postgres; fi;