mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-09-02 21:02:41 +02:00
Code Issues Releases Wiki Activity

Merge PR #1201 branch 'develop-olympus' into develop

Browse Source 
* 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
This commit is contained in:
Oleg Pudeyev
2013-01-24 01:16:56 -05:00
parent ec97e60e17 229d1092f8
commit 01607be42a
4 changed files with 60 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -23,7 +23,8 @@ before_script:
- phpenv rehash
- cd phpBB
- php ../composer.phar install --dev
- cd ../
- cd ..
- sh -c "if [ `php -r "echo (int) version_compare(PHP_VERSION, '5.3.19', '>=');"` = "1" ]; then travis/setup-webserver.sh; fi"
script:
- phpunit --configuration travis/phpunit-$DB-travis.xml