makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages 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
commit 01607be42a
4 changed files with 60 additions and 3 deletions
Show stats 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 - phpenv rehash
- cd phpBB - cd phpBB
- php ../composer.phar install --dev - 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: script:
- phpunit --configuration travis/phpunit-$DB-travis.xml - phpunit --configuration travis/phpunit-$DB-travis.xml

3
travis/phpunit-mysql-travis.xml
View file

@ -17,7 +17,7 @@
<exclude>tests/functional</exclude> <exclude>tests/functional</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Functional Tests"> <testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
@ -36,5 +36,6 @@
<server name="PHPBB_TEST_DBPASSWD" value="" /> <server name="PHPBB_TEST_DBPASSWD" value="" />
<server name="PHPBB_TEST_REDIS_HOST" value="localhost" /> <server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/> <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
</php> </php>
</phpunit> </phpunit>

3
travis/phpunit-postgres-travis.xml
View file

@ -17,7 +17,7 @@
<exclude>tests/functional</exclude> <exclude>tests/functional</exclude>
</testsuite> </testsuite>
<testsuite name="phpBB Functional Tests"> <testsuite name="phpBB Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.0" phpVersionOperator=">=">../tests/functional</directory> <directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">../tests/functional</directory>
</testsuite> </testsuite>
</testsuites> </testsuites>
@ -38,5 +38,6 @@
<server name="PHPBB_TEST_DBPASSWD" value="" /> <server name="PHPBB_TEST_DBPASSWD" value="" />
<server name="PHPBB_TEST_REDIS_HOST" value="localhost" /> <server name="PHPBB_TEST_REDIS_HOST" value="localhost" />
<server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/> <server name="PHPBB_TEST_TABLE_PREFIX" value="phpbb_"/>
<server name="PHPBB_FUNCTIONAL_URL" value="http://localhost/" />
</php> </php>
</phpunit> </phpunit>

54
travis/setup-webserver.sh Executable file
View file

@ -0,0 +1,54 @@
#!/bin/bash
#
# @copyright (c) 2013 phpBB Group
# @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
#
set -e
sudo apt-get update -qq
sudo apt-get install -qq nginx realpath
sudo service nginx stop
DIR=$(dirname "$0")
PHPBB_ROOT_PATH=$(realpath "$DIR/../phpBB")
NGINX_CONF="/etc/nginx/sites-enabled/default"
PHP_FPM_BIN="$HOME/.phpenv/versions/$TRAVIS_PHP_VERSION/sbin/php-fpm"
PHP_FPM_CONF="$DIR/php-fpm.conf"
PHP_FPM_SOCK=$(realpath "$DIR")/php-fpm.sock
USER=$(whoami)
# php-fpm configuration
echo "
[global]
[travis]
user = $USER
group = $USER
listen = $PHP_FPM_SOCK
pm = static
pm.max_children = 2
php_admin_value[memory_limit] = 128M
" > $PHP_FPM_CONF
# nginx configuration
echo "
server {
listen 80;
root $PHPBB_ROOT_PATH/;
index index.php index.html;
location ~ \.php$ {
fastcgi_pass unix:$PHP_FPM_SOCK;
include fastcgi_params;
}
}
" | sudo tee $NGINX_CONF > /dev/null
# Start daemons
sudo $PHP_FPM_BIN --fpm-config "$DIR/php-fpm.conf"
sudo service nginx start