mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-28 10:40:28 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'github-phpbb/develop-olympus' into develop

Browse Source 
* 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
This commit is contained in:
Nils Adermann
2013-10-15 13:36:42 -07:00
parent 3521dfc278 8131700330
commit 437d38bc05
3 changed files with 76 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.travis.yml
View File

@@ -6,13 +6,14 @@ php:
- 5.5
env:
- DB=mariadb
- DB=mysql
- DB=postgres
before_script:
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi"
- sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'create database phpbb_tests;' -U postgres; fi"
- sh -c "if [ '$DB' = 'mysql' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
- sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
- travis/install-php-extensions.sh
- cd phpBB
- php ../composer.phar install --dev --no-interaction --prefer-source