From: gggeek Date: Sun, 13 Dec 2020 17:45:28 +0000 (+0000) Subject: wip travis X-Git-Tag: plcapi-7.1-0~3^2~129 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=b36e1e65e2a827a99c356bb27cd03d7ebc7ac59d;p=plcapi.git wip travis --- diff --git a/tests/ci/setup/setup_php_travis.sh b/tests/ci/setup/setup_php_travis.sh index 1d51431..7e671c7 100755 --- a/tests/ci/setup/setup_php_travis.sh +++ b/tests/ci/setup/setup_php_travis.sh @@ -25,8 +25,6 @@ configure_php_ini ~/.phpenv/versions/${PHPVER}/etc/php.ini # configure php-fpm cp ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf.default ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf -cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf - # work around travis issue #3385 if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d)" ]; then @@ -43,6 +41,9 @@ if [ -d ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d ]; then fi fi +cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.conf +cat ~/.phpenv/versions/${PHPVER}/etc/php-fpm.d/www.conf + # @todo run php-fpm as root, and set up 'travis' as user in www.conf, instead ? ~/.phpenv/versions/${PHPVER}/sbin/php-fpm