git://git.onelab.eu / plcapi.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
WIP add a Docker-based test env
[plcapi.git] / .travis.yml
diff --git a/.travis.yml b/.travis.yml
index 1492085..bcb3af8 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,13 +7,11 @@ dist: xenial
 
 env:
     global:
-        # temp workaround to xdebug 3.0.0 bug
-        - XDEBUG_MODE=coverage
         - LOCALSERVER=localhost
         - URI=/demo/server/server.php
         - HTTPSSERVER=localhost
         - HTTPSURI=/demo/server/server.php
-        - PROXY=localhost:8080
+        - PROXYSERVER=localhost:8080
         # 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
         - HTTPSVERIFYHOST=0
@@ -40,6 +38,7 @@ before_install:
   - sudo apt-get install -y privoxy
 
   # Disable xdebug for speed (executing composer), but allow us to re-enable it later
+  # @todo move to setup_php
   - export XDEBUG_INI=`php -i | grep xdebug.ini | grep home/travis | grep -v '=>' | head -1`
   - export XDEBUG_INI=${XDEBUG_INI/,/}
   - if [ "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI" "$XDEBUG_INI.bak"; fi
@@ -49,19 +48,19 @@ install:
 
   # Re-enable xdebug for when we need to generate code coverage
   - export COVERAGE_OPTS=""
-  - if [ "$TRAVIS_PHP_VERSION" = "7.3" -a "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI.bak" "$XDEBUG_INI" && export COVERAGE_OPTS="--coverage-clover=coverage.clover"; fi
+  - if [ "$TRAVIS_PHP_VERSION" = "7.4" -a "$XDEBUG_INI" != "" ]; then mv "$XDEBUG_INI.bak" "$XDEBUG_INI" && export COVERAGE_OPTS="--coverage-clover=coverage.clover"; fi
 
 before_script:
   # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
-  - ./tests/ci/travis/setup_php_fpm.sh
-  - ./tests/ci/travis/setup_apache.sh
-  - ./tests/ci/travis/setup_privoxy.sh
+  - sudo ./tests/ci/setup/setup_apache.sh
+  - sudo ./tests/ci/setup/setup_php.sh
+  - sudo ./tests/ci/setup/setup_privoxy.sh
 
   # output what version of phpunit we got going
   - vendor/bin/phpunit --version
 
 script:
-  vendor/bin/phpunit $COVERAGE_OPTS tests
+  ./vendor/bin/phpunit $COVERAGE_OPTS tests
 
 after_failure:
   # Save as much info as we can to help developers
plcapi