Merge branch 'develop-olympus' into develop-ascraeus

* develop-olympus:
  [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
This commit is contained in:
Joas Schilling 2014-04-03 23:07:58 +02:00
commit 23455e92d0

View file

@ -26,8 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
then then
# Upgrade to a recent stable version of HHVM # Upgrade to a recent stable version of HHVM
sudo apt-get -o Dpkg::Options::="--force-confnew" \ sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm
install -y hhvm=3.0.0~precise
# MySQLi is broken in HHVM 3.0.0~precise and still does not work for us in # MySQLi is broken in HHVM 3.0.0~precise and still does not work for us in
# 2014.03.28~saucy, i.e. needs more work. Use MySQL extension for now. # 2014.03.28~saucy, i.e. needs more work. Use MySQL extension for now.