mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
26,382 Commits 17 Branches 190 Tags
Commit Graph

109 Commits

Author SHA1 Message Date
Nils Adermann
f5f6b834f8 [develop] Remove left over conflict marker from merge 1a31f03 2014-02-04 16:01:49 +01:00
Nils Adermann
1a31f03a7b Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12162] Set language to C before running diff to ensure its english
  [ticket/11509] Be exact when referencing the branch name.
  [ticket/12161] Do not use subdirectories in build/save directory.
  [ticket/11509] Run commit message checker only in one environment.
  [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode.

Conflicts:
	.travis.yml
 2014-02-04 13:05:20 +01:00
Nils Adermann
db9fd30e7c Merge pull request #1998 from bantu/ticket/12141 
[ticket/12141] Disable opcache extension on PHP 5.5.7
 2014-02-04 02:57:35 -08:00
Andreas Fischer
33593a508c [ticket/11509] Be exact when referencing the branch name. 
PHPBB3-11509
 2014-02-04 02:18:46 +01:00
Andreas Fischer
ac954a7c4b [ticket/12141] PHP extension setup must happen before webserver + PHP-FPM. 
PHPBB3-12141
 2014-02-04 02:16:00 +01:00
Andreas Fischer
b6d45c5d71 [ticket/11985] Do not try to setup PHP extensions on HHVM. 
PHPBB3-11985
 2014-02-04 00:13:36 +01:00
Andreas Fischer
116ff19185 [ticket/11985] Rename install -> setup. This is more generic and consistent. 
PHPBB3-11985
 2014-02-04 00:12:28 +01:00
Andreas Fischer
5069922e24 [ticket/11509] Run commit message checker only in one environment. 
PHPBB3-11509
 2014-02-03 23:50:48 +01:00
Andreas Fischer
6f727bc0f9 [ticket/11509] Contrary to docs, COMMIT_RANGE is not available in PR mode. 
PHPBB3-11509
 2014-02-03 23:44:15 +01:00
Andreas Fischer
1594c09971 [ticket/11509] Perform commit message checking after PHPUnit (fixes path). 
PHPBB3-11509
 2014-02-03 17:19:35 +01:00
Nils Adermann
1f93d940fd Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11509] Fail on Travis CI if commit messages are improperly formatted.

Conflicts:
	.travis.yml
 2014-02-03 01:08:25 +01:00
Andreas Fischer
16e81d4d18 [ticket/11509] Fail on Travis CI if commit messages are improperly formatted. 
PHPBB3-11509
 2014-02-02 17:11:30 +01:00
Nils Adermann
8a6b961c54 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/12147] Remove Travis CI notifications.

Conflicts:
	.travis.yml
 2014-02-02 16:27:28 +01:00
Andreas Fischer
9cc8768fa0 [ticket/12147] Remove Travis CI notifications. 
We don't want to get notifications for branches other people are working on.

PHPBB3-12147
 2014-02-02 15:12:30 +01:00
Paul Tarjan
f495f937e9 HHVM is failing for now 
Lets at least keep running it so we remember to fix it
 2013-12-13 18:11:49 -08:00
Paul Tarjan
66c9ca4400 Try running unit tests on HHVM 2013-12-13 11:49:12 -08:00
Joas Schilling
a3df2cb454 [ticket/12027] List redis as service in .travis.yml 
PHPBB3-12027
 2013-11-22 10:26:05 +01:00
Andreas Fischer
5b66083120 [task/code-sniffer] Reorganise .travis.yml 
PHPBB3-11980
 2013-10-29 01:03:53 +01:00
Andreas Fischer
6a7db8d51a [task/code-sniffer] Require code sniffer to pass on Travis CI. 
PHPBB3-11980
 2013-10-29 00:59:51 +01:00
Andreas Fischer
c230701e48 [task/code-sniffer] Run code sniffer in PHP 5.5 / MySQL Travis CI environment. 
PHPBB3-11980
 2013-10-27 17:43:08 +01:00
Andreas Fischer
ecc756e12e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11920] Print MariaDB version after successful setup.
  [ticket/11920] Manually purge mysql-common.
  [ticket/11920] Actually call travis/setup-mariadb.sh.
 2013-10-16 02:17:11 +02:00
Andreas Fischer
878cb836f5 [ticket/11920] Actually call travis/setup-mariadb.sh. 
PHPBB3-11920
 2013-10-15 22:44:49 +02:00
Nils Adermann
437d38bc05 Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop 
* 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
 2013-10-15 13:36:42 -07:00
Andreas Fischer
cdaea7a406 [ticket/11920] Add MariaDB environment to Travis-CI. 
PHPBB3-11920
 2013-10-15 16:28:59 +02:00
Andreas Fischer
147d01f7ee Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11580] Enable prefer-source option (should error way less)
  [ticket/11580] Enable --no-interaction option on composer for travis

Conflicts:
	.travis.yml
 2013-05-28 01:17:32 +02:00
Joas Schilling
65307f1382 [ticket/11580] Enable prefer-source option (should error way less) 
PHPBB3-11580
 2013-05-27 23:48:04 +02:00
Joas Schilling
2d0fb52eaa [ticket/11580] Enable --no-interaction option on composer for travis 
There is no interaction available on travis ;)

PHPBB3-11580
 2013-05-27 23:35:57 +02:00
Nils Adermann
c583d9f5e7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis.
 2013-05-09 20:16:32 +02:00
Andreas Fischer
d1415676c5 [ticket/11324] PHP 5.5 is in RC stage. No longer allow failure on travis. 
PHPBB3-11324
 2013-05-09 20:10:25 +02:00
Nils Adermann
3327739290 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/11513] Update RUNNING_TESTS.txt to no longer refer to PEAR.
  [ticket/11513] Update all CLI calls to phpunit to use vendor/bin.
  [ticket/11513] Use PHPUnit from composer in .travis.yml.
  [ticket/11513] Update (all) composer dependencies.
  [ticket/11513] Add PHPUnit 3.7 and DbUnit 1.2 as a composer dev dependency.

Conflicts:
	.travis.yml
	phpBB/composer.lock
 2013-05-09 19:42:13 +02:00
Andreas Fischer
b5b1e88915 [ticket/11513] Use PHPUnit from composer in .travis.yml. 
PHPBB3-11513
 2013-05-09 18:46:29 +02:00
Oleg Pudeyev
01607be42a Merge PR #1201 branch 'develop-olympus' into develop 
* 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
 2013-01-24 01:16:56 -05:00
Andreas Fischer
9860cf6b16 [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. 
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
 2013-01-23 15:48:44 +01:00
Andreas Fischer
dee1b38ebc [ticket/11337] Run functional tests on travis using nginx and php-fpm. 
PHPBB3-11337
 2013-01-23 15:48:44 +01:00
Andreas Fischer
bd180b8e38 [ticket/11338] Travis CI: Install PHP extension for redis key-value store. 
PHPBB3-11338
 2013-01-23 01:39:39 +01:00
Oleg Pudeyev
56e6d0531b Merge PR #1191 branch 'develop-olympus' into develop 
# By Andreas Fischer
# Via Andreas Fischer (1) and Oleg Pudeyev (1)
* develop-olympus:
  [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail.
 2013-01-13 18:14:41 -05:00
Andreas Fischer
4001410c8c [ticket/11324] Add PHP 5.5 environment to travis and allow it to fail. 
PHPBB3-11324
 2013-01-13 23:41:40 +01:00
Andreas Fischer
5407f9b00d [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus. 
PHPBB3-11060
 2012-08-26 15:09:00 +02:00
Igor Wiedler
ca4cee86af [ticket/11060] Make sure pyrus can install everything on travis 
This is needed so it can install symfony/yaml from a new channel.

PHPBB3-11060
 2012-08-19 02:28:11 +02:00
Andreas Fischer
db7b879b82 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer

Conflicts:
	.travis.yml
	composer.phar
	phpBB/composer.json
	phpBB/composer.lock
	tests/bootstrap.php
 2012-07-19 16:59:45 +02:00
Andreas Fischer
3bbb882fe8 Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus 
* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer
 2012-07-19 16:40:33 +02:00
Andreas Fischer
b176b86f11 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
 2012-07-18 09:46:32 +02:00
Patrick Webster
d157c3b3f4 [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL 
PHPBB3-10996
 2012-07-18 01:22:24 -05:00
Fyorl
aa2f7bcc2c [ticket/10981] Added check for PHP version before running composer 
PHPBB3-10981
 2012-07-17 21:39:49 +01:00
Fyorl
74074994ba [ticket/10981] Modified travis to use composer with --dev 
PHPBB3-10981
 2012-07-17 21:39:49 +01:00
Andreas Fischer
d738441f38 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis.

Conflicts:
	.travis.yml
 2012-05-27 15:42:30 +02:00
Andreas Fischer
8cb9004ab3 [ticket/10909] Also test develop-olympus with low PHP 5.3 version on travis. 
Also test develop-olympus with low PHP 5.3 version (i.e. PHP 5.3.3) on travis.

PHPBB3-10909
 2012-05-27 12:30:12 +02:00
Erik Frèrejean
0e906f2575 [task/10869] Remove PHP 5.2 check from .travis.yml 
The travis configuration file contains a statement that checks whether
the test is ran against PHP 5.2 but as that version isn't tested at
all the check can be removed.

PHPBB3-10869
 2012-05-04 00:13:27 +02:00
Michael Cullum
3c21a8e21e [ticket/10736] Changing travis so it installs composer.phar to phpBB/ 
PHPBB3-10736
 2012-03-31 09:38:58 +01:00
Michael Cullum
afc2c5a2e3 [feature/event-dispatcher] Add composer install to travis 
PHPBB3-9550
 2012-03-24 11:03:54 +00:00