Merge branch '2.8' into 3.4

* 2.8:
  [travis] cache in ~/php-ext/
This commit is contained in:
Nicolas Grekas 2018-02-22 14:00:34 +01:00
commit 084a5bcc3b
1 changed files with 2 additions and 2 deletions

View File

@ -36,7 +36,7 @@ cache:
directories: directories:
- .phpunit - .phpunit
- php-$MIN_PHP - php-$MIN_PHP
- php-ext - ~/php-ext
services: services:
- memcached - memcached
@ -117,7 +117,7 @@ before_install:
local ext_so=$2 local ext_so=$2
local INI=$3 local INI=$3
local ext_dir=$(php -r "echo ini_get('extension_dir');") local ext_dir=$(php -r "echo ini_get('extension_dir');")
local ext_cache=php-ext/$(basename $ext_dir)/$ext_name local ext_cache=~/php-ext/$(basename $ext_dir)/$ext_name
if [[ -e $ext_cache/$ext_so ]]; then if [[ -e $ext_cache/$ext_so ]]; then
echo extension = $ext_cache/$ext_so >> $INI echo extension = $ext_cache/$ext_so >> $INI