diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 13:38:01 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-10 13:38:01 +0200 |
| commit | f0f479c517ef0d2044973bf09e8befeffedbb521 (patch) | |
| tree | 4bee87c33984a76299ca0f1708f06ef37c43aa58 | |
| parent | 8920ca5d438aafcede84b4e96381d93647b2d6cc (diff) | |
| parent | 4d206e2cedf735d8c2860a136347a8bd5194f182 (diff) | |
| download | forums-f0f479c517ef0d2044973bf09e8befeffedbb521.tar forums-f0f479c517ef0d2044973bf09e8befeffedbb521.tar.gz forums-f0f479c517ef0d2044973bf09e8befeffedbb521.tar.bz2 forums-f0f479c517ef0d2044973bf09e8befeffedbb521.tar.xz forums-f0f479c517ef0d2044973bf09e8befeffedbb521.zip | |
Merge remote-tracking branch 'bantu/ticket/12320' into develop-olympus
* bantu/ticket/12320:
[ticket/12320] Install a nightly build of HHVM.
[ticket/12320] No longer allow Travis CI HHVM environment to fail.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | travis/setup-webserver.sh | 2 |
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. |