From 0b3e715541becd32b328bae960d335e646ce3f89 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Mon, 16 Mar 2015 23:20:58 +0000 Subject: [PATCH] add MariaDB 5.5 environment to travis (#17460, #19344, #19395) git-svn-id: http://svn.redmine.org/redmine/trunk@14128 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .travis.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 379280087..f1494a9ae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -25,6 +25,10 @@ env: - "TEST_SUITE=functionals DATABASE_ADAPTER=mysql-5.7-dmr" - "TEST_SUITE=integration DATABASE_ADAPTER=mysql-5.7-dmr" - "TEST_SUITE=ui DATABASE_ADAPTER=mysql-5.7-dmr" + - "TEST_SUITE=units DATABASE_ADAPTER=mariadb-5.5" + - "TEST_SUITE=functionals DATABASE_ADAPTER=mariadb-5.5" + - "TEST_SUITE=integration DATABASE_ADAPTER=mariadb-5.5" + - "TEST_SUITE=ui DATABASE_ADAPTER=mariadb-5.5" - "TEST_SUITE=units DATABASE_ADAPTER=mariadb-10.0" - "TEST_SUITE=functionals DATABASE_ADAPTER=mariadb-10.0" - "TEST_SUITE=integration DATABASE_ADAPTER=mariadb-10.0" @@ -43,6 +47,7 @@ matrix: # http://www.redmine.org/issues/19344 - env: "TEST_SUITE=units DATABASE_ADAPTER=mysql-5.6" - env: "TEST_SUITE=units DATABASE_ADAPTER=mysql-5.7-dmr" + - env: "TEST_SUITE=units DATABASE_ADAPTER=mariadb-5.5" - env: "TEST_SUITE=units DATABASE_ADAPTER=mariadb-10.0" before_install: - "sudo apt-get update -qq" @@ -54,7 +59,8 @@ before_install: if [[ $DATABASE_ADAPTER =~ mariadb ]] ; then 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' ; + MARIADB_VER=`echo $DATABASE_ADAPTER | sed -e 's/mariadb-//'` ; + sudo add-apt-repository ''"deb http://ftp.osuosl.org/pub/mariadb/repo/${MARIADB_VER}/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 ; -- 2.39.5