X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=.travis.yml;h=8865ca57e7a4b0549f2a08675e485267981ca03f;hb=32cb3f6e7092aafa464a6fc177607e73ea926f20;hp=11361f56ca39a0fdbed4990a3d88dd49fe7a0b92;hpb=ad0603c6e2be7d5cf77a521381aabab2bdfb74a3;p=plcapi.git

diff --git a/.travis.yml b/.travis.yml
index 11361f5..8865ca5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -32,51 +32,45 @@ php:
   - 8.0
 
 before_install:
+  # @todo stop useless daemons to save memory: snapd, docker, ...
   # 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
+  # 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.sh
-
-  # 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
+  - ./tests/ci/setup/setup_php_travis.sh
 
 install:
   - composer install
 
 before_script:
-  # Set up Apache and Privoxy instances inside the Travis VM and use them for testing against
-  #- 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
+  # Output what version of phpunit we got going
   - ./vendor/bin/phpunit --version
 
 script:
   ./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/"'
+  # Troubleshoot
+  #- cat /etc/passwd
+  #- ps auxwww
+  #- 'sudo find /etc/php | sed -e "s/[^-][^\/]*\// |/g" -e "s/|\([^ ]\)/|-\1/"'
+  #- php -i
+  - ls -la /run/php
+  #- 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
+  # Show as much info as we can to help developers
+  - sudo cat /var/log/privoxy.log
   - cat apache_error.log
   - cat apache_access.log
+  - sudo cat /var/log/php*.log
 
 after_script:
   # Upload code-coverage to Scrutinizer
-  - if [ -f coverage.clover ]; then wget https://scrutinizer-ci.com/ocular.phar; fi
-  - if [ -f coverage.clover ]; then php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
+  - if [ -f coverage.clover ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover coverage.clover; fi
   # Upload code-coverage CodeClimate - disabled as it does not support php 8 atm
   #- if [ -f coverage.clover ]; then CODECLIMATE_REPO_TOKEN=7fa6ee01e345090e059e5e42f3bfbcc8692feb8340396382dd76390a3019ac13 ./vendor/bin/test-reporter --coverage-report=coverage.clover; fi