Merge branch 'master' into php5

* master:
  runkit: Provide alternative repository for PHP 5.6.
  runkit: Change git from git:// to https://
This commit is contained in:
Andreas Fischer 2014-09-04 22:59:23 +02:00
commit 30385bdffc

View File

@ -20,9 +20,11 @@ function install_php_extension
echo "extension=$1.so" >> `php --ini | grep "Loaded Configuration" | sed -e "s|.*:\s*||"`
}
if [ "$TRAVIS_PHP_VERSION" != "5.6" ]
then
# runkit
git clone git://github.com/zenovich/runkit.git
install_php_extension 'runkit'
if [ "$TRAVIS_PHP_VERSION" == "5.6" ]
then
git clone https://github.com/adrianguenter/runkit.git
else
git clone https://github.com/zenovich/runkit.git
fi
install_php_extension 'runkit'