Merge branch '3.4' into 4.0

* 3.4:
  [travis] fix passing $INI to tpecl()
  Sync UPGRADE-3.0.md with 3.4
This commit is contained in:
Nicolas Grekas 2018-02-22 13:53:36 +01:00
commit a1fa96dbac
1 changed files with 4 additions and 3 deletions

View File

@ -102,6 +102,7 @@ before_install:
tpecl () {
local ext_name=$1
local ext_so=$2
local INI=$3
local ext_dir=$(php -r "echo ini_get('extension_dir');")
local ext_cache=php-ext/$(basename $ext_dir)/$ext_name
@ -140,9 +141,9 @@ before_install:
sudo apt-get install libsodium-dev -y
fi
tfold ext.apcu tpecl apcu-5.1.6 apcu.so
tfold ext.libsodium tpecl libsodium sodium.so
tfold ext.mongodb tpecl mongodb-1.4.0RC1 mongodb.so
tfold ext.apcu tpecl apcu-5.1.6 apcu.so $INI
tfold ext.libsodium tpecl libsodium sodium.so $INI
tfold ext.mongodb tpecl mongodb-1.4.0RC1 mongodb.so $INI
fi
- |