diff options
| author | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-14 06:31:44 +0000 |
|---|---|---|
| committer | Toshi MARUYAMA <marutosijp2@yahoo.co.jp> | 2015-03-14 06:31:44 +0000 |
| commit | fadbadd95bc43ae9f376420f07bd52ac209aae7c (patch) | |
| tree | 585f921ab243c301b0ff9a9cebc74f9dc9f98e99 /lib/tasks | |
| parent | c1c75a449ee77e6751c49b9e5ba1db8158bd4d96 (diff) | |
| download | redmine-fadbadd95bc43ae9f376420f07bd52ac209aae7c.tar.gz redmine-fadbadd95bc43ae9f376420f07bd52ac209aae7c.zip | |
add MariaDB 10.0 environment to travis (#17460, #19344)
git-svn-id: http://svn.redmine.org/redmine/trunk@14077 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'lib/tasks')
| -rw-r--r-- | lib/tasks/ci.rake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/tasks/ci.rake b/lib/tasks/ci.rake index 52a876b2c..ac6e4ad2b 100644 --- a/lib/tasks/ci.rake +++ b/lib/tasks/ci.rake @@ -56,7 +56,7 @@ file 'config/database.yml' do test_db_name = "ci_#{branch}_#{ruby}_test" case database - when 'mysql' + when /(mysql|mariadb)/ dev_conf = {'adapter' => 'mysql2', 'database' => dev_db_name, 'host' => 'localhost', 'encoding' => 'utf8'} |