diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-10-15 16:34:32 -0700 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-10-15 16:34:32 -0700 |
| commit | 16ab35c1b50f191299d49e1c8d3ffe74a4051dd3 (patch) | |
| tree | 0f8400c2eaffd96ca04a708a1b003d950a121ac0 | |
| parent | 813170033006d6615071700d36ce3ba454e87753 (diff) | |
| parent | 5a481bb1763477edbacf530de7c64a729a796084 (diff) | |
| download | forums-16ab35c1b50f191299d49e1c8d3ffe74a4051dd3.tar forums-16ab35c1b50f191299d49e1c8d3ffe74a4051dd3.tar.gz forums-16ab35c1b50f191299d49e1c8d3ffe74a4051dd3.tar.bz2 forums-16ab35c1b50f191299d49e1c8d3ffe74a4051dd3.tar.xz forums-16ab35c1b50f191299d49e1c8d3ffe74a4051dd3.zip | |
Merge pull request #1782 from bantu/ticket/11920
[ticket/11920] Actually call travis/setup-mariadb.sh.
| -rw-r--r-- | .travis.yml | 1 | ||||
| -rwxr-xr-x | travis/setup-mariadb.sh | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index 03bc7fb945..ecaf43c4b5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,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" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then pear install --force phpunit/DbUnit; phpenv rehash; fi" - cd phpBB diff --git a/travis/setup-mariadb.sh b/travis/setup-mariadb.sh index 2e974da8eb..02520b1c2c 100755 --- a/travis/setup-mariadb.sh +++ b/travis/setup-mariadb.sh @@ -11,6 +11,9 @@ VERSION='5.5' # Operating system codename, e.g. "precise" 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 then sudo apt-get update -qq @@ -31,3 +34,5 @@ USE mysql; UPDATE user SET Password = PASSWORD('') where User = 'root'; FLUSH PRIVILEGES; " | mysql -u root -prootpasswd + +mysql --version |