[Groonga-mysql-commit] mroonga/mroonga at 3d32ec6 [master] travis: bundle Groonga and groonga-normalizer-mysql for MariaDB bundled test

Back to archive index

Kouhei Sutou null+****@clear*****
Thu Mar 26 11:02:54 JST 2015


Kouhei Sutou	2015-03-26 11:02:54 +0900 (Thu, 26 Mar 2015)

  New Revision: 3d32ec647284f9e47e4dd9351461170c540e8998
  https://github.com/mroonga/mroonga/commit/3d32ec647284f9e47e4dd9351461170c540e8998

  Message:
    travis: bundle Groonga and groonga-normalizer-mysql for MariaDB bundled test

  Modified files:
    tools/travis/install.sh

  Modified: tools/travis/install.sh (+17 -8)
===================================================================
--- tools/travis/install.sh    2015-03-26 10:22:24 +0900 (f7b66cb)
+++ tools/travis/install.sh    2015-03-26 11:02:54 +0900 (02edc8e)
@@ -24,14 +24,6 @@ mariadb_download_base=http://mirror.jmu.edu/pub/mariadb
 # export GROONGA_MASTER=yes
 export GROONGA_NORMALIZER_MYSQL_MASTER=yes
 
-curl --silent --location https://github.com/groonga/groonga/raw/master/data/travis/setup.sh | sh
-curl --silent --location https://github.com/groonga/groonga-normalizer-mysql/raw/master/data/travis/setup.sh | sh
-# curl --silent --location https://github.com/clear-code/cutter/raw/master/data/travis/setup.sh | sh
-
-if [ ! -f /usr/lib/groonga/plugins/tokenizers/mecab.so ]; then
-  sudo apt-get -qq -y install groonga-tokenizer-mecab
-fi
-
 if [ "${MROONGA_BUNDLED}" = "yes" ]; then
   mkdir -p .mroonga
   mv * .mroonga/
@@ -46,7 +38,24 @@ if [ "${MROONGA_BUNDLED}" = "yes" ]; then
   rm -rf storage/mroonga
   mv .mroonga storage/mroonga
   rm -rf ${MYSQL_VERSION}
+  git clone --recursive --depth 1 \
+      https://github.com/groonga/groonga.git \
+      storage/mroonga/vendor/groonga
+  git clone --recursive --depth 1 \
+      https://github.com/groonga/groonga-normalizer-mysql.git \
+      storage/mroonga/vendor/groonga/vendor/plugins/groonga-normalizer-mysql
 else
+  curl --silent --location \
+       https://github.com/groonga/groonga/raw/master/data/travis/setup.sh | sh
+  curl --silent --location \
+       https://github.com/groonga/groonga-normalizer-mysql/raw/master/data/travis/setup.sh | sh
+  # curl --silent --location \
+  #      https://github.com/clear-code/cutter/raw/master/data/travis/setup.sh | sh
+
+  if [ ! -f /usr/lib/groonga/plugins/tokenizers/mecab.so ]; then
+    sudo apt-get -qq -y install groonga-tokenizer-mecab
+  fi
+
   mkdir -p vendor
   cd vendor
 
-------------- next part --------------
HTML����������������������������...
Download 



More information about the Groonga-mysql-commit mailing list
Back to archive index