From 1dfa2589847638c0ae90b239c4c490b1f62eed9a Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 10 Sep 2019 15:27:11 +0900 Subject: [PATCH] ARROW-6502: [GLib][CI] Pin gobject-introspection gem to 3.3.7 It'll fix MinGW failure in CI. Closes #5338 from kou/glib-gi-3.3.7 and squashes the following commits: 6d1dc6aa4 Pin ffc8eed28 ARROW-6502: Pin gobject-introspection gem to 3.3.7 Authored-by: Sutou Kouhei Signed-off-by: Sutou Kouhei --- c_glib/Gemfile | 2 +- ci/travis_before_script_c_glib.sh | 4 ++-- ruby/red-arrow/red-arrow.gemspec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/c_glib/Gemfile b/c_glib/Gemfile index 4b570902bcd72..f42c1850a1785 100644 --- a/c_glib/Gemfile +++ b/c_glib/Gemfile @@ -20,4 +20,4 @@ source "https://rubygems.org/" gem "test-unit" -gem "gobject-introspection" +gem "gobject-introspection", "= 3.3.7" diff --git a/ci/travis_before_script_c_glib.sh b/ci/travis_before_script_c_glib.sh index ee3668df01ffa..848992efcfb81 100755 --- a/ci/travis_before_script_c_glib.sh +++ b/ci/travis_before_script_c_glib.sh @@ -36,8 +36,6 @@ else conda install -q -y ninja fi -gem install test-unit gobject-introspection - if [ $TRAVIS_OS_NAME = "osx" ]; then sudo env PKG_CONFIG_PATH=$PKG_CONFIG_PATH luarocks install lgi else @@ -47,6 +45,8 @@ fi pushd $ARROW_C_GLIB_DIR +bundle install + export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$ARROW_CPP_INSTALL/lib/pkgconfig export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$ARROW_CPP_INSTALL/lib diff --git a/ruby/red-arrow/red-arrow.gemspec b/ruby/red-arrow/red-arrow.gemspec index f4fcda90efe57..75430b5b979e1 100644 --- a/ruby/red-arrow/red-arrow.gemspec +++ b/ruby/red-arrow/red-arrow.gemspec @@ -47,7 +47,7 @@ Gem::Specification.new do |spec| spec.extensions = ["ext/arrow/extconf.rb"] spec.add_runtime_dependency("extpp", ">= 0.0.7") - spec.add_runtime_dependency("gio2", ">= 3.3.6") + spec.add_runtime_dependency("gio2", "= 3.3.7") spec.add_runtime_dependency("native-package-installer") spec.add_runtime_dependency("pkg-config")