From 509dee39962ec712884f1c6658f383c4db793785 Mon Sep 17 00:00:00 2001 From: gggeek Date: Sun, 3 Sep 2017 19:33:11 +0100 Subject: [PATCH] Attempt at fixing Travis for php 7.2 --- .travis.yml | 4 ++-- tests/ci/travis/setup_php_fpm.sh | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c518d0..3944cfc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: php -# the current Travis VMs are based on Ubuntu Trusty. Alas, those do not have php 5.3 available. SO we keep using Precise... +# the current Travis VMs are based on Ubuntu Trusty. Alas, those do not have php 5.3 available. So we keep using Precise... dist: precise php: @@ -11,7 +11,7 @@ php: - 7.0 - 7.1 - 7.2 - # hhvm is not available any more on default travis images + # hhvm is not available any more on Precise images #- hhvm before_install: diff --git a/tests/ci/travis/setup_php_fpm.sh b/tests/ci/travis/setup_php_fpm.sh index dd462b2..a31aadb 100755 --- a/tests/ci/travis/setup_php_fpm.sh +++ b/tests/ci/travis/setup_php_fpm.sh @@ -9,6 +9,9 @@ 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 +if [ "$TRAVIS_PHP_VERSION" = "7.2" -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 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 ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm -- 2.43.0