From b19ee00b9cc8846279fd1e60efaa939b8499e666 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Thu, 10 Apr 2014 18:45:27 +0200 Subject: [PATCH 1/2] [ticket/12384] Run Travis CI HHVM tests against MySQLi instead of MySQL. HHVM MySQLi has been fixed and works for us now. PHPBB3-12384 --- travis/setup-webserver.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/travis/setup-webserver.sh b/travis/setup-webserver.sh index 6188d2c232..bffe2c0bf4 100755 --- a/travis/setup-webserver.sh +++ b/travis/setup-webserver.sh @@ -28,10 +28,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 \ From 7392c755621234f3794df2df4319166119799896 Mon Sep 17 00:00:00 2001 From: Andreas Fischer Date: Tue, 27 May 2014 18:13:01 +0200 Subject: [PATCH 2/2] [ticket/12384] Use mysqli on hhvm in ascraeus. Keep explicit matrix though. PHPBB3-12384 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0ac1464540..407860e36f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,7 +21,7 @@ matrix: - php: 5.6 env: DB=mysqli - php: hhvm - env: DB=mysql + env: DB=mysqli allow_failures: - php: hhvm fast_finish: true