diogo
/
symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '3.4' into 4.0 

* 3.4:
  fix merge
  [travis] cache in ~/php-ext/
This commit is contained in:
Nicolas Grekas 2018-02-22 14:01:32 +01:00
parent a1fa96dbac 8f1ca2b3e4
commit 73c2ea8d19
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -32,7 +32,7 @@ cache:
directories: directories:
- .phpunit - .phpunit
- php-$MIN_PHP - php-$MIN_PHP
- php-ext - ~/php-ext
services: services:
- memcached - memcached
@ -104,7 +104,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
@ -135,7 +135,7 @@ before_install:
# Install extra PHP extensions # Install extra PHP extensions
if [[ ! $skip ]]; then if [[ ! $skip ]]; then
# install libsodium # install libsodium
if [[ ! -e php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then if [[ ! -e ~/php-ext/$(php -r "echo basename(ini_get('extension_dir'));")/libsodium/sodium.so ]]; then
sudo add-apt-repository ppa:ondrej/php -y sudo add-apt-repository ppa:ondrej/php -y
sudo apt-get update -q sudo apt-get update -q
sudo apt-get install libsodium-dev -y sudo apt-get install libsodium-dev -y