diff options
| author | Yuriy Rusko <github@rusko.net> | 2014-05-27 21:55:40 +0200 |
|---|---|---|
| committer | Yuriy Rusko <github@rusko.net> | 2014-05-27 21:55:40 +0200 |
| commit | 1d61bcedfd1882f84d102c523a354a8c4ae69336 (patch) | |
| tree | cbc3aead2546002d82fa0503eaab7f1520c515b8 /travis | |
| parent | 27f787e5e4e118b77a3e16879d6c684bdaafc303 (diff) | |
| parent | 0acaa7722956635b8f17e19cddc6f02a602b7352 (diff) | |
| download | forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar.gz forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar.bz2 forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.tar.xz forums-1d61bcedfd1882f84d102c523a354a8c4ae69336.zip | |
Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Conflicts:
phpBB/docs/hook_system.html
Diffstat (limited to 'travis')
| -rwxr-xr-x | travis/setup-webserver.sh | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index ed4a7536cd..a9941d4def 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -33,10 +33,6 @@ then # Upgrade to a recent stable version of 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. - sed -i "s/mysqli/mysql/" "$DIR/phpunit-mysql-travis.xml" - HHVM_LOG=$(realpath "$DIR")/hhvm.log sudo hhvm \ |