X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=3944cfcdbaff3f26b05e3a36d2f9f82449aecf3a;hb=ac735cf96eb914759f7e7595630857254b599783;hp=efe4af906a7e8927464d196c81e1557e8c547659;hpb=eb00ccc94d22b89172a7dedff973da779875b9f3;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index efe4af9..3944cfc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,12 +1,18 @@
 language: php
 
+# the current Travis VMs are based on Ubuntu Trusty. Alas, those do not have php 5.3 available. So we keep using Precise...
+dist: precise
+
 php:
   - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
-  - hhvm
+  - 7.1
+  - 7.2
+  # hhvm is not available any more on Precise images
+  #- hhvm
 
 before_install:
   # This is mandatory or the 'apt-get install' calls following will fail
@@ -21,13 +27,16 @@ before_script:
   # Disable xdebug for speed.
   # NB: this should NOT be done for hhvm and php 7.0.
   # Also we use the php 5.6 run to generate code coverage reports, and we need xdebug for that
-  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" -a "$TRAVIS_PHP_VERSION" != "7.0" -a "$TRAVIS_PHP_VERSION" != "5.6" ]; then phpenv config-rm xdebug.ini; fi
+  - if [ "$TRAVIS_PHP_VERSION" != "hhvm" -a "$TRAVIS_PHP_VERSION" != "7.2"  -a "$TRAVIS_PHP_VERSION" != "7.0" -a "$TRAVIS_PHP_VERSION" != "5.6" ]; then phpenv config-rm xdebug.ini; fi
 
   # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
   - if [ "$TRAVIS_PHP_VERSION" != "hhvm" ]; then ./tests/ci/travis/setup_php_fpm.sh; ./tests/ci/travis/setup_apache.sh; fi
   - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then ./tests/ci/travis/setup_hhvm.sh; ./tests/ci/travis/setup_apache_hhvm.sh; fi
   - ./tests/ci/travis/setup_privoxy.sh
 
+  # output what version of phpunit we got going
+  - vendor/bin/phpunit --version
+
 script:
   # Travis currently compiles PHP with an oldish cURL/GnuTLS combination;
   # to make the tests pass when Apache has a bogus SSL cert whe need the full set of options below
@@ -37,8 +46,8 @@ after_failure:
   # Save as much info as we can to help developers
   - cat apache_error.log
   - cat apache_access.log
-  - cat /var/log/hhvm/error.log
-  - if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then php -i; fi
+  #- cat /var/log/hhvm/error.log
+  #- if [ "$TRAVIS_PHP_VERSION" = "hhvm" ]; then php -i; fi
 
 after_script:
   # Upload code-coverage to Scrutinizer