diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 13:38:17 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 13:38:17 +0200 |
| commit | 0e2079da8542658c7183473d4984bdc030183f58 (patch) | |
| tree | d39e17ac39e9129fd100fb6798d413b927e38ac7 /travis | |
| parent | 377fb770fb37f4fb797ab234e44c4d387d4f8a64 (diff) | |
| parent | f0f479c517ef0d2044973bf09e8befeffedbb521 (diff) | |
| download | forums-0e2079da8542658c7183473d4984bdc030183f58.tar forums-0e2079da8542658c7183473d4984bdc030183f58.tar.gz forums-0e2079da8542658c7183473d4984bdc030183f58.tar.bz2 forums-0e2079da8542658c7183473d4984bdc030183f58.tar.xz forums-0e2079da8542658c7183473d4984bdc030183f58.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12320] Install a nightly build of HHVM.
[ticket/12320] No longer allow Travis CI HHVM environment to fail.
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-webserver.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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. |