[Groonga-commit] groonga/groonga at 3600c05 [master] travis: use ruby in PATH

Back to archive index
Kouhei Sutou null+****@clear*****
Sat Mar 23 11:48:02 JST 2019


Kouhei Sutou	2019-03-23 11:48:02 +0900 (Sat, 23 Mar 2019)

  Revision: 3600c054b86ded4e521edd76a8ede088e6b314fe
  https://github.com/groonga/groonga/commit/3600c054b86ded4e521edd76a8ede088e6b314fe

  Message:
    travis: use ruby in PATH

  Modified files:
    CMakeLists.txt
    configure.ac
    travis/before-script.sh
    travis/install.sh

  Modified: CMakeLists.txt (+3 -0)
===================================================================
--- CMakeLists.txt    2019-03-23 07:39:58 +0900 (d0f56a285)
+++ CMakeLists.txt    2019-03-23 11:48:02 +0900 (07a88f113)
@@ -651,6 +651,9 @@ else()
 endif()
 
 find_program(RUBY NAMES
+  "ruby2.6" "ruby26"
+  "ruby2.5" "ruby25"
+  "ruby2.4" "ruby24"
   "ruby2.3" "ruby23"
   "ruby2.2" "ruby22"
   "ruby2.1" "ruby21"

  Modified: configure.ac (+1 -0)
===================================================================
--- configure.ac    2019-03-23 07:39:58 +0900 (82ebae2aa)
+++ configure.ac    2019-03-23 11:48:02 +0900 (4030512c5)
@@ -738,6 +738,7 @@ else
   if test "x$RUBY" = "xyes"; then
     AC_PATH_PROGS(RUBY,
                   [ dnl
+                    ruby2.6 ruby26d dnl
                     ruby2.5 ruby25 dnl
                     ruby2.4 ruby24 dnl
                     ruby2.3 ruby23 dnl

  Modified: travis/before-script.sh (+2 -2)
===================================================================
--- travis/before-script.sh    2019-03-23 07:39:58 +0900 (eed84c6a0)
+++ travis/before-script.sh    2019-03-23 11:48:02 +0900 (24ba1ba70)
@@ -44,7 +44,7 @@ case "${BUILD_TOOL}" in
       configure_args="${configure_args} --enable-debug"
     #fi
     if [ "${ENABLE_MRUBY}" = "yes" ]; then
-      configure_args="${configure_args} --with-ruby --enable-mruby"
+      configure_args="${configure_args} --with-ruby=$(which ruby) --enable-mruby"
     fi
     if [ "${ENABLE_DOCUMENT}" = "yes" ]; then
       configure_args="${configure_args} --enable-document"
@@ -59,7 +59,7 @@ case "${BUILD_TOOL}" in
     cmake_args=""
     cmake_args="${cmake_args} -DGRN_WITH_DEBUG=yes"
     if [ "${ENABLE_MRUBY}" = "yes" ]; then
-      cmake_args="${cmake_args} -DGRN_WITH_MRUBY=yes"
+      cmake_args="${cmake_args} -DRUBY=$(which ruby) -DGRN_WITH_MRUBY=yes"
     fi
 
     cmake . ${cmake_args}

  Modified: travis/install.sh (+0 -1)
===================================================================
--- travis/install.sh    2019-03-23 07:39:58 +0900 (f5a3c8ce9)
+++ travis/install.sh    2019-03-23 11:48:02 +0900 (1f71c88ad)
@@ -48,7 +48,6 @@ case "${TRAVIS_OS_NAME}" in
            python3-pip
       sudo pip3 install Sphinx
     fi
-    sudo gem install grntest
     ;;
   osx)
     brew update > /dev/null
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.osdn.me/mailman/archives/groonga-commit/attachments/20190323/6ca998c3/attachment-0001.html>


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