Merge pull request #21502 from gnossen/v1.26.x
Backport #21487 to v1.26.x.
diff --git a/examples/ruby/grpc-demo.gemspec b/examples/ruby/grpc-demo.gemspec
index 90f75fb..703d391 100644
--- a/examples/ruby/grpc-demo.gemspec
+++ b/examples/ruby/grpc-demo.gemspec
@@ -19,5 +19,5 @@
s.add_dependency 'grpc', '~> 1.0'
s.add_dependency 'multi_json', '~> 1.13.1'
- s.add_development_dependency 'bundler', '~> 1.7'
+ s.add_development_dependency 'bundler', '>= 1.9'
end
diff --git a/grpc.gemspec b/grpc.gemspec
index 379f003..1aac74a 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -32,7 +32,7 @@
s.add_dependency 'google-protobuf', '~> 3.8'
s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
- s.add_development_dependency 'bundler', '~> 1.9'
+ s.add_development_dependency 'bundler', '>= 1.9'
s.add_development_dependency 'facter', '~> 2.4'
s.add_development_dependency 'logging', '~> 2.0'
s.add_development_dependency 'simplecov', '~> 0.14.1'
diff --git a/templates/grpc.gemspec.template b/templates/grpc.gemspec.template
index e1741c2..a46e53d 100644
--- a/templates/grpc.gemspec.template
+++ b/templates/grpc.gemspec.template
@@ -34,7 +34,7 @@
s.add_dependency 'google-protobuf', '~> 3.8'
s.add_dependency 'googleapis-common-protos-types', '~> 1.0'
- s.add_development_dependency 'bundler', '~> 1.9'
+ s.add_development_dependency 'bundler', '>= 1.9'
s.add_development_dependency 'facter', '~> 2.4'
s.add_development_dependency 'logging', '~> 2.0'
s.add_development_dependency 'simplecov', '~> 0.14.1'
diff --git a/test/distrib/ruby/distribtest.gemspec b/test/distrib/ruby/distribtest.gemspec
index f11f521..13d370f 100644
--- a/test/distrib/ruby/distribtest.gemspec
+++ b/test/distrib/ruby/distribtest.gemspec
@@ -17,5 +17,5 @@
s.add_dependency 'public_suffix', '< 3.0'
s.add_dependency 'jwt', '< 2.0'
- s.add_development_dependency 'bundler', '~> 1.7'
+ s.add_development_dependency 'bundler', '>= 1.9'
end
diff --git a/tools/run_tests/artifacts/build_artifact_ruby.sh b/tools/run_tests/artifacts/build_artifact_ruby.sh
index 09423ce..b0eecf2 100755
--- a/tools/run_tests/artifacts/build_artifact_ruby.sh
+++ b/tools/run_tests/artifacts/build_artifact_ruby.sh
@@ -37,6 +37,12 @@
fi
set +ex
+
+# To workaround the problem with bundler 2.1.0 and rubygems-bundler 1.4.5
+# https://github.com/bundler/bundler/issues/7488
+rvm @global
+gem uninstall rubygems-bundler
+
rvm use default
gem install bundler -v 1.17.3
