aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-03 23:07:35 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-04-03 23:07:35 +0200
commit296e573b6baf70e74f6f463ee6af5604dba298df (patch)
tree3d365a9661766d8006454704b612f8c3dc9c7d89
parent801a1f9ab9941e6d68f27591c55f26d02cceb90b (diff)
parent1a044711fb34e29ac32c78111750a233f077ad9a (diff)
downloadforums-296e573b6baf70e74f6f463ee6af5604dba298df.tar
forums-296e573b6baf70e74f6f463ee6af5604dba298df.tar.gz
forums-296e573b6baf70e74f6f463ee6af5604dba298df.tar.bz2
forums-296e573b6baf70e74f6f463ee6af5604dba298df.tar.xz
forums-296e573b6baf70e74f6f463ee6af5604dba298df.zip
Merge remote-tracking branch 'bantu/ticket/12318' into develop-olympus
* bantu/ticket/12318: [ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
-rwxr-xr-xtravis/setup-webserver.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 9802fab749..92c46f77f9 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -26,8 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
then
# Upgrade to a recent stable version of HHVM
- sudo apt-get -o Dpkg::Options::="--force-confnew" \
- install -y hhvm=3.0.0~precise
+ sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm
# 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.