This reverts commit f6614f2078740675ca0228b348500991888c2140 as the install
command started failing with "Version '3.0.0~precise' for 'hhvm' was not found"
in the meantime.
PHPBB3-12318
* develop-olympus:
[ticket/12318] Use MySQL instead of MySQLi for now on HHVM.
[ticket/12318] Pin HHVM version to 3.0.0~precise.
[ticket/12318] Always install new config file on HHVM upgrade conflict.
[ticket/12318] Add PPA providing dependencies for recent HHVM on Ubuntu 12.04.
[ticket/12318] Upgrade to a recent stable version of HHVM.
[ticket/12318] Correctly setup HHVM for functional tests.
/home/travis/build/phpbb/phpbb/redis/redis.c:6141:34:
error: unknown type name ‘tsrm_ls’
make: *** [redis.lo] Error 1
The command "sh -c "if [ '$TRAVIS_PHP_VERSION' != 'hhvm' ];
then travis/setup-php-extensions.sh; fi"" failed
and exited with 2 during install.
PHPBB3-12281
* github-phpbb/develop-olympus:
[ticket/11920] Have to use empty root password otherwise db creation fails.
[ticket/11920] Add MariaDB environment to Travis-CI.
Conflicts:
.travis.yml
# By Igor Wiedler (1) and others
* develop-olympus:
[ticket/11671] Update composer.lock
[ticket/11671] Add phing as a dependency and upgrade deps
[ticket/11668] Move lint test to the end for travis
Conflicts:
phpBB/composer.lock
* develop-olympus:
[ticket/11337] Abort setup-webserver.sh script when an error occurs.
[ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.
[ticket/11337] Silence nginx config file writing.
[ticket/11337] php-fpm.conf is no longer owned by root.
[ticket/11337] Run functional tests on travis using nginx and php-fpm.
Conflicts:
.travis.yml
* upstream/develop: (196 commits)
[ticket/11219] Coding guidelines and naming consistency changes
[ticket/10841] Revert more whitespace changes.
[ticket/10841] Revert whitespace changes.
[ticket/10841] adding space after if
[ticket/10841] removing unnecessary spacing
[ticket/10841] changing affectedrows check to COUNT in sql
[ticket/10841] Modifying style and language selectors in UCP
[ticket/11247] Fix wrong property reference in flock class.
[ticket/10602] Avoid a race condition.
[ticket/10602] Use last_queue_run for its intended purpose.
[ticket/10716] Collect standard error from executed php process.
[ticket/10716] Skip test if php is not in PATH.
[ticket/10716] Exclude our dependencies from linting.
[ticket/10103] New and improved wording.
[ticket/10716] Only lint on php 5.3+.
[ticket/10103] Assert with messages.
[ticket/10103] assertLessThan/assertGreaterThan.
[ticket/10103] Inline assignment is bad?
[ticket/10103] $rv had too few characters.
[ticket/10103] Correct flock class documentation.
...
Conflicts:
phpBB/includes/functions.php
tests/cache/cache_test.php
