X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=test%2Fci%2Ftravis%2Fsetup_php_fpm.sh;h=58bdc145df6e3a24e2e38cc767c82e41cc42cede;hb=6b83da54ce9ed9b7a2c90c7a9581aac648755c41;hp=e9ad9c63a0605a167269a8a4c076487181b8bdc2;hpb=a9f8fc9e2522ce70ad92db4e46aa417face93a81;p=plcapi.git diff --git a/test/ci/travis/setup_php_fpm.sh b/test/ci/travis/setup_php_fpm.sh index e9ad9c6..58bdc14 100755 --- a/test/ci/travis/setup_php_fpm.sh +++ b/test/ci/travis/setup_php_fpm.sh @@ -6,10 +6,13 @@ sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.ph if [ "$TRAVIS_PHP_VERSION" = "7.0" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf fi +if [ "$TRAVIS_PHP_VERSION" = "7.1" -a -n "$(ls -A ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d)" ]; then + sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.d/www.conf +fi -# NB: the following does not seem to work with php 5.3... echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini echo "always_populate_raw_post_data = -1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini +# NB: the following does not seem to work with php 5.3... echo "include_path = '.:$(pwd)/lib'" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm