makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1782 from bantu/ticket/11920

Browse source 
[ticket/11920] Actually call travis/setup-mariadb.sh.
This commit is contained in:
Nils Adermann 2013-10-15 16:34:32 -07:00
commit 16ab35c1b5
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.travis.yml
View file

@ -14,6 +14,7 @@ env:
before_script: 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 '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' = '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" - sh -c "if [ '$DB' = 'mysql' -o '$DB' = 'mariadb' ]; then mysql -e 'create database IF NOT EXISTS phpbb_tests;'; fi"
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi"
- cd phpBB - cd phpBB

5
travis/setup-mariadb.sh
View file

@ -11,6 +11,9 @@ VERSION='5.5'
# Operating system codename, e.g. "precise" # Operating system codename, e.g. "precise"
OS_CODENAME=$(lsb_release --codename --short) OS_CODENAME=$(lsb_release --codename --short)
# Manually purge MySQL to remove conflicting files (e.g. /etc/mysql/my.cnf)
sudo apt-get purge -qq mysql-common
if ! which add-apt-repository > /dev/null if ! which add-apt-repository > /dev/null
then then
sudo apt-get update -qq sudo apt-get update -qq
@ -31,3 +34,5 @@ USE mysql;
UPDATE user SET Password = PASSWORD('') where User = 'root'; UPDATE user SET Password = PASSWORD('') where User = 'root';
FLUSH PRIVILEGES; FLUSH PRIVILEGES;
" | mysql -u root -prootpasswd " | mysql -u root -prootpasswd
mysql --version