From f5cb94477060332063a3d33cfb79f0bc5010545e Mon Sep 17 00:00:00 2001
From: gggeek <giunta.gaetano@gmail.com>
Date: Sun, 13 Dec 2020 12:37:45 +0000
Subject: [PATCH] travis wip
---
.travis.yml | 32 +++++++++++++++++++-------------
tests/ci/setup/setup_php.sh | 2 ++
2 files changed, 21 insertions(+), 13 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 365eb356..11361f56 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,35 +34,41 @@ 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
+ #- sudo apt-get install -y apache2 libapache2-mod-fastcgi
+ #- sudo apt-get install -y privoxy
+ - 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
+ #- 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
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
- - sudo ./tests/ci/setup/setup_apache.sh
- - sudo ./tests/ci/setup/setup_php.sh
- - sudo ./tests/ci/setup/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
+ - ./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/"'
+
# Save as much info as we can to help developers
- cat apache_error.log
- cat apache_access.log
diff --git a/tests/ci/setup/setup_php.sh b/tests/ci/setup/setup_php.sh
index fe9e0b0a..36bb1164 100644
--- a/tests/ci/setup/setup_php.sh
+++ b/tests/ci/setup/setup_php.sh
@@ -100,4 +100,6 @@ if [ -n "$TRAVIS" ]; then
~/.phpenv/versions/${PHPVER}/sbin/php-fpm
# @todo configure apache for php-fpm via mod_proxy_fcgi
+ a2enconf php${PHPVER}-fpm
+ service apache2 restart
fi
--
2.47.0