wip travis

[plcapi.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index e9d8fe4..2f500cb 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,11 +7,11 @@ dist: xenial
 
 env:
     global:
-        - LOCALSERVER=localhost
+        - HTTPSERVER=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
@@ -34,34 +34,30 @@ php:
 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
-
-  # Disable xdebug for speed (executing composer), but allow us to re-enable it later
-  - 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
+  # Just in case there are git misconfigurations: make sure scripts are executable
+  - sudo chmod 755 ./tests/ci/setup/*.sh
+  - sudo ./tests/ci/setup/setup_apache.sh
+  - sudo ./tests/ci/setup/setup_privoxy.sh
+  - sudo ./tests/ci/setup/setup_php_travis.sh
 
 install:
   - composer install
 
-  # Re-enable xdebug for when we need to generate code coverage
-  - export COVERAGE_OPTS=""
-  - 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
-
-  # output what version of phpunit we got going
-  - vendor/bin/phpunit --version
+  # 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:
+  # temp
+  - ps auxwww
+  - cat /etc/passwd
+  - sudo ls -ltr /var/log
+  - sudo ls -ltr /var/log/apache2
+  - 'sudo find /etc/apache2 | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/|-\1/"'
+
   # Save as much info as we can to help developers
   - cat apache_error.log
   - cat apache_access.log