mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop-ascraeus

Browse Source 
* develop-olympus:
  [ticket/12320] Install a nightly build of HHVM.
  [ticket/12320] No longer allow Travis CI HHVM environment to fail.
This commit is contained in:
Joas Schilling 2014-04-10 13:38:17 +02:00
commit 0e2079da85
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -40,5 +40,3 @@ matrix:
env: DB=mariadb env: DB=mariadb
- php: 5.4 - php: 5.4
env: DB=postgres env: DB=postgres
allow_failures:
- php: hhvm

2
travis/setup-webserver.sh
View File

@ -26,7 +26,7 @@ APP_SOCK=$(realpath "$DIR")/php-app.sock
if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ] if [ "$TRAVIS_PHP_VERSION" = 'hhvm' ]
then then
# Upgrade to a recent stable version of HHVM # 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 # 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. # 2014.03.28~saucy, i.e. needs more work. Use MySQL extension for now.