diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-10-16 02:17:11 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-10-16 02:17:11 +0200 |
| commit | ecc756e12e8f2a65fbe7d636dac7cc330fa4719f (patch) | |
| tree | 1410e2074bc598b972d5fe13debf48048b4488d0 | |
| parent | 7afff1e5bd0befbc7c235ee659d8811618e1742e (diff) | |
| parent | 16ab35c1b50f191299d49e1c8d3ffe74a4051dd3 (diff) | |
| download | forums-ecc756e12e8f2a65fbe7d636dac7cc330fa4719f.tar forums-ecc756e12e8f2a65fbe7d636dac7cc330fa4719f.tar.gz forums-ecc756e12e8f2a65fbe7d636dac7cc330fa4719f.tar.bz2 forums-ecc756e12e8f2a65fbe7d636dac7cc330fa4719f.tar.xz forums-ecc756e12e8f2a65fbe7d636dac7cc330fa4719f.zip | |
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.
| -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 d75868f778..a5c27632b4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 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 |