X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=01f7d05c8628cf6836ea8fd6d2eaf07b67b8be97;hb=29fddbc6b33b742c79fc142c4743c00d15ec9465;hp=ca59cd00518c2ee227bcd360327b384081dea5f5;hpb=c4fee09ff818cfcbe0f673a6b673e11bf64205c5;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index ca59cd0..01f7d05 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,26 +1,43 @@
 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.2
   - 5.3
   - 5.4
   - 5.5
   - 5.6
-  - hhvm
+  - 7.0
+  - 7.1
+  - 7.2
+  - 7.3
+
+before_install:
+  # This is mandatory or the 'apt-get install' calls following will fail
+  - sudo apt-get update -qq
+  - sudo apt-get install -y apache2 libapache2-mod-fastcgi
+  - sudo apt-get install -y privoxy
 
 install:
-  # NB: the lib does not declare dependencies for now. Also, composer will not run on php 5.2
-  - if [ $TRAVIS_PHP_VERSION != "5.2" ]; then composer self-update && composer install; fi
+  # NB: the lib does not declare dependencies for now...
+  - composer self-update && composer install
 
 before_script:
-  # Disable xdebug. NB: this should NOT be done for hhvm...
-  - if [ $TRAVIS_PHP_VERSION != "hhvm" ]; then phpenv config-rm xdebug.ini; fi
+  # Disable xdebug
+  - phpenv config-rm xdebug.ini
 
-  # TODO: we should set up an Apache instance inside the Travis VM and test it.
-  # But it looks a bit complex, esp. as it seems that php has to be set up differently (cgi vs fpm) depending on version
-  # So for now we just take an easy way out using a known remote server.
-  # See: https://gist.github.com/roderik/3123962
-  # See: http://docs.travis-ci.com/user/languages/php/#Apache-%2B-PHP
+  # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
+  - ./test/ci/travis/setup_php_fpm.sh; ./test/ci/travis/setup_apache.sh
+  - ./test/ci/travis/setup_privoxy.sh
 
 script:
-  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=gggeek.altervista.org URI=/sw/xmlrpc/demo/server/server.php HTTPSSERVER=gggeek.ssl.altervista.org HTTPSURI=/sw/xmlrpc/demo/server/server.php NOPROXY=1
+  # 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
+  php -d "include_path=.:./lib:./test" test/testsuite.php LOCALSERVER=localhost URI=/demo/server/server.php HTTPSSERVER=localhost HTTPSURI=/demo/server/server.php PROXY=localhost:8080 HTTPSVERIFYHOST=0 HTTPSIGNOREPEER=1 SSLVERSION=3
+
+after_failure:
+  # Save as much info as we can to help developers
+  - cat apache_error.log
+  - cat apache_access.log
+  - php -i