aboutsummaryrefslogtreecommitdiffstats
path: root/travis
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2013-10-262-7/+9
|\ | | | | | | | | | | * develop-olympus: [ticket/11970] Make apt-get less quiet. [ticket/11970] Add set -x to Travis setup scripts.
| * [ticket/11970] Make apt-get less quiet.Andreas Fischer2013-10-262-7/+7
| | | | | | | | PHPBB3-11970
| * [ticket/11970] Add set -x to Travis setup scripts.Andreas Fischer2013-10-262-0/+2
| | | | | | | | | | | | Output is hidden by Travis by default and this will allow easier debugging. PHPBB3-11970
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-10-251-1/+11
|\ \ | |/ | | | | | | * develop-olympus: [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.
| * [ticket/11920] Pin MariaDB repository to avoid conflicts with Ubuntu MySQL.Andreas Fischer2013-10-251-1/+11
| | | | | | | | PHPBB3-11920
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-10-161-0/+5
|\ \ | |/ | | | | | | | | | | * develop-olympus: [ticket/11920] Print MariaDB version after successful setup. [ticket/11920] Manually purge mysql-common. [ticket/11920] Actually call travis/setup-mariadb.sh.
| * [ticket/11920] Print MariaDB version after successful setup.Andreas Fischer2013-10-161-0/+2
| | | | | | | | PHPBB3-11920
| * [ticket/11920] Manually purge mysql-common.Andreas Fischer2013-10-161-0/+3
| | | | | | | | PHPBB3-11920
* | Merge remote-tracking branch 'github-phpbb/develop-olympus' into developNils Adermann2013-10-152-0/+74
|\ \ | |/ | | | | | | | | | | | | | | * 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
| * [ticket/11920] Have to use empty root password otherwise db creation fails.Andreas Fischer2013-10-152-1/+8
| | | | | | | | PHPBB3-11920
| * [ticket/11920] Add MariaDB environment to Travis-CI.Andreas Fischer2013-10-152-0/+67
| | | | | | | | PHPBB3-11920
* | [ticket/11700] travis has hardcoded driver class names without namespacesNils Adermann2013-09-162-2/+2
| | | | | | | | PHPBB3-11700
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-09-021-1/+1
|\ \ | |/ | | | | | | * develop-olympus: [ticket/11823] Set up nginx server to match PHP files with characters after .php
| * [ticket/11823] Set up nginx server to match PHP files with characters after .phpDavid King2013-09-021-1/+1
| | | | | | | | PHPBB3-11823
* | Merge branch 'develop-olympus' into developAndreas Fischer2013-07-231-3/+0
|\ \ | |/ | | | | | | * develop-olympus: [ticket/11726] Don't run lint tests on Travis on postgres
| * [ticket/11726] Don't run lint tests on Travis on postgresNathan Guse2013-07-221-3/+0
| | | | | | | | PHPBB3-11726
* | Merge branch 'develop-olympus' into developNathaniel Guse2013-07-132-0/+8
|\ \ | |/ | | | | | | | | | | | | | | | | | | # 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
| * [ticket/11668] Move lint test to the end for travisIgor Wiedler2013-07-122-0/+8
| | | | | | | | PHPBB3-11668
* | Merge PR #1201 branch 'develop-olympus' into developOleg Pudeyev2013-01-243-2/+58
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | * 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
| * [ticket/11337] Abort setup-webserver.sh script when an error occurs.Andreas Fischer2013-01-231-0/+1
| | | | | | | | PHPBB3-11337
| * [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.Andreas Fischer2013-01-232-2/+2
| | | | | | | | | | | | | | There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19, which is what 5.3 is currently aliased to. PHPBB3-11337
| * [ticket/11337] Silence nginx config file writing.Andreas Fischer2013-01-231-1/+1
| | | | | | | | PHPBB3-11337
| * [ticket/11337] php-fpm.conf is no longer owned by root.Andreas Fischer2013-01-231-1/+1
| | | | | | | | PHPBB3-11337
| * [ticket/11337] Run functional tests on travis using nginx and php-fpm.Andreas Fischer2013-01-233-0/+55
| | | | | | | | PHPBB3-11337
* | [ticket/11338] Travis CI: Install PHP extension for redis key-value store.Andreas Fischer2013-01-231-0/+21
| | | | | | | | PHPBB3-11338
* | [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.Andreas Fischer2013-01-222-0/+2
| | | | | | | | PHPBB3-11338
* | Merge remote-tracking branch 'upstream/develop' into ticket/11015Oleg Pudeyev2012-12-062-0/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| * [ticket/11240] Enable PHPUnit's verbose mode so we get a list of skipped tests.Andreas Fischer2012-12-042-0/+2
| | | | | | | | PHPBB3-11240
* | [ticket/11015] Fix configuration for travisIgor Wiedler2012-07-212-2/+2
|/ | | | PHPBB3-11015
* [ticket/10492] Skip functional tests on PHP 5.2 on travisNils Adermann2012-05-112-0/+8
| | | | PHPBB3-10492
* [ticket/10723] Stop Travis running all tests on sqliteMichael Cullum2012-03-232-14/+14
| | | | | | Correct information so all tests don't run on sqlite PHPBB3-10723
* [task/travis] Exclude functional and slow testsMichael Cullum2012-03-222-0/+12
| | | | PHPBB3-10718
* [task/travis] Some more small travis fixesMichael Cullum2012-03-221-1/+1
| | | | PHPBB3-10718
* [task/travis] Rename travis phpunit config filesMichael Cullum2012-03-222-0/+0
| | | | PHPBB3-10718
* [task/travis] Adding Travis Continuous Intergration SupportMichael Cullum2012-03-222-0/+58
PHPBB3-10718
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-17 05:12:46 +0000