null+****@clear*****
null+****@clear*****
Fri Aug 10 16:36:46 JST 2012
Kouhei Sutou 2012-08-10 16:36:46 +0900 (Fri, 10 Aug 2012) New Revision: 8e013074b0ade07e2e259aec91fe6ca69472cc84 https://github.com/mroonga/mroonga/commit/8e013074b0ade07e2e259aec91fe6ca69472cc84 Log: traivs: use MARIADB_VERSION for MariaDB Modified files: .travis.yml tools/travis_before_script.sh Modified: .travis.yml (+1 -1) =================================================================== --- .travis.yml 2012-08-10 16:34:09 +0900 (ff6f823) +++ .travis.yml 2012-08-10 16:36:46 +0900 (232025b) @@ -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 Modified: tools/travis_before_script.sh (+4 -4) =================================================================== --- tools/travis_before_script.sh 2012-08-10 16:34:09 +0900 (0078a28) +++ tools/travis_before_script.sh 2012-08-10 16:36:46 +0900 (cc43f59) @@ -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 -------------- next part -------------- HTML����������������������������...다운로드