git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3ab03b3
)
wip travis
author
gggeek
<giunta.gaetano@gmail.com>
Sun, 13 Dec 2020 17:45:28 +0000
(17:45 +0000)
committer
gggeek
<giunta.gaetano@gmail.com>
Sun, 13 Dec 2020 17:45:28 +0000
(17:45 +0000)
tests/ci/setup/setup_php_travis.sh
patch
|
blob
|
history
diff --git
a/tests/ci/setup/setup_php_travis.sh
b/tests/ci/setup/setup_php_travis.sh
index
1d51431
..
7e671c7
100755
(executable)
--- 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
# 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
# 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
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
# @todo run php-fpm as root, and set up 'travis' as user in www.conf, instead ?
~/.phpenv/versions/${PHPVER}/sbin/php-fpm