diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-03 23:07:58 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-03 23:07:58 +0200 |
| commit | 23455e92d027550e2e36dadd5b0096b0c3779dd9 (patch) | |
| tree | 09b0b1e5e70ee16ad29303b3ecfaf523e9ba8553 /travis | |
| parent | 4e3117a27f3f2eb074219abcb924944b2205b2ff (diff) | |
| parent | 296e573b6baf70e74f6f463ee6af5604dba298df (diff) | |
| download | forums-23455e92d027550e2e36dadd5b0096b0c3779dd9.tar forums-23455e92d027550e2e36dadd5b0096b0c3779dd9.tar.gz forums-23455e92d027550e2e36dadd5b0096b0c3779dd9.tar.bz2 forums-23455e92d027550e2e36dadd5b0096b0c3779dd9.tar.xz forums-23455e92d027550e2e36dadd5b0096b0c3779dd9.zip | |
Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
[ticket/12318] Revert "Pin HHVM version to 3.0.0~precise."
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-webserver.sh | 3 |
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. |