aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.travis.yml2
-rwxr-xr-xtravis/setup-webserver.sh2
2 files changed, 1 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 5e70ef97ec..da9236a82f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,5 +33,3 @@ matrix:
env: DB=mariadb
- php: 5.4
env: DB=postgres
- allow_failures:
- - php: hhvm
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh
index 92c46f77f9..6188d2c232 100755
--- a/travis/setup-webserver.sh
+++ b/travis/setup-webserver.sh
@@ -26,7 +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
+ sudo apt-get -o Dpkg::Options::="--force-confnew" install -y hhvm-nightly
# 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.