1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-01 06:20:46 +02:00

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.
This commit is contained in:
Andreas Fischer
2013-10-16 02:17:11 +02:00
2 changed files with 6 additions and 0 deletions

View File

@@ -13,6 +13,7 @@ env:
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' = 'mariadb' ]; then travis/setup-mariadb.sh; 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