traivs: use MARIADB_VERSION for MariaDB

mroonga · Aug 10, 2012 · 8e01307 · 8e01307
1 parent 889af25
commit 8e01307
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ language: cpp
 env:
 #  - MYSQL_VERSION=system
   - MYSQL_VERSION=5.5.27
-  - MYSQL_TYPE=mariadb MYSQL_VERSION=5.5.25
+  - MARIADB_VERSION=5.5.25
 install:
   - echo "deb http://packages.groonga.org/ubuntu/ $(lsb_release --short --codename) universe" | sudo tee /etc/apt/sources.list.d/groonga.list
   - echo "deb-src http://packages.groonga.org/ubuntu/ $(lsb_release --short --codename) universe" | sudo tee --append /etc/apt/sources.list.d/groonga.list

diff --git a/tools/travis_before_script.sh b/tools/travis_before_script.sh
@@ -18,10 +18,10 @@ if [ "$MYSQL_VERSION" = "system" ]; then
     cd ..
 else
     sudo apt-get -y install cmake
-    if [ "$MYSQL_TYPE" = "mariadb" ]; then
-	wget http://mirror3.layerjet.com/mariadb/mariadb-${MYSQL_VERSION}/kvm-tarbake-jaunty-x86/mariadb-${MYSQL_VERSION}.tar.gz
-	tar xzf mariadb-${MYSQL_VERSION}.tar.gz
-	ln -s mariadb-${MYSQL_VERSION} mysql
+    if [ -n "$MARIADB_VERSION" ]; then
+	wget http://mirror3.layerjet.com/mariadb/mariadb-${MARIADB_VERSION}/kvm-tarbake-jaunty-x86/mariadb-${MARIADB_VERSION}.tar.gz
+	tar xzf mariadb-${MARIADB_VERSION}.tar.gz
+	ln -s mariadb-${MARIADB_VERSION} mysql
     else
 	wget http://cdn.mysql.com/Downloads/MySQL-5.5/mysql-${MYSQL_VERSION}.tar.gz
 	tar xzf mysql-${MYSQL_VERSION}.tar.gz