Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2025-11-08 22:36:02 +01:00
Code Issues Packages Projects Releases Activity

add MariaDB 10.0 environment to travis (#17460, #19344)

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@14077 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2015-03-14 06:31:44 +00:00
parent c1c75a449e
commit fadbadd95b
2 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.travis.yml
View File

@@ -17,6 +17,10 @@ env:
- "TEST_SUITE=functionals DATABASE_ADAPTER=mysql" - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql"
- "TEST_SUITE=integration DATABASE_ADAPTER=mysql" - "TEST_SUITE=integration DATABASE_ADAPTER=mysql"
- "TEST_SUITE=ui DATABASE_ADAPTER=mysql" - "TEST_SUITE=ui DATABASE_ADAPTER=mysql"
- "TEST_SUITE=units DATABASE_ADAPTER=mariadb-10.0"
- "TEST_SUITE=functionals DATABASE_ADAPTER=mariadb-10.0"
- "TEST_SUITE=integration DATABASE_ADAPTER=mariadb-10.0"
- "TEST_SUITE=ui DATABASE_ADAPTER=mariadb-10.0"
- "TEST_SUITE=units DATABASE_ADAPTER=sqlite3" - "TEST_SUITE=units DATABASE_ADAPTER=sqlite3"
- "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3" - "TEST_SUITE=functionals DATABASE_ADAPTER=sqlite3"
- "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3" - "TEST_SUITE=integration DATABASE_ADAPTER=sqlite3"
@@ -27,9 +31,22 @@ matrix:
# http://www.redmine.org/issues/19091 # http://www.redmine.org/issues/19091
# https://github.com/jruby/jruby/issues/779 # https://github.com/jruby/jruby/issues/779
- rvm: jruby - rvm: jruby
# http://www.redmine.org/issues/17460
# http://www.redmine.org/issues/19344
- env: "TEST_SUITE=units DATABASE_ADAPTER=mariadb-10.0"
before_install: before_install:
- "sudo apt-get update -qq" - "sudo apt-get update -qq"
- "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion" - "sudo apt-get --no-install-recommends install bzr cvs git mercurial subversion"
- if [[ $DATABASE_ADAPTER =~ mariadb ]] ;
then
sudo service mysql stop ;
sudo apt-get install python-software-properties ;
sudo apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db ;
sudo add-apt-repository 'deb http://ftp.osuosl.org/pub/mariadb/repo/10.0/ubuntu precise main' ;
sudo apt-get update ;
sudo DEBIAN_FRONTEND=noninteractive apt-get -q --yes --force-yes -f --option DPkg::Options::=--force-confnew install mariadb-server ;
sudo apt-get install libmariadbd-dev ;
fi
script: script:
- "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem" - "SCMS=bazaar,cvs,subversion,git,mercurial,filesystem"
- "export SCMS" - "export SCMS"

2
lib/tasks/ci.rake
View File

@@ -56,7 +56,7 @@ file 'config/database.yml' do
test_db_name = "ci_#{branch}_#{ruby}_test" test_db_name = "ci_#{branch}_#{ruby}_test"
case database case database
when 'mysql' when /(mysql|mariadb)/
dev_conf = {'adapter' => 'mysql2', dev_conf = {'adapter' => 'mysql2',
'database' => dev_db_name, 'host' => 'localhost', 'database' => dev_db_name, 'host' => 'localhost',
'encoding' => 'utf8'} 'encoding' => 'utf8'}