diff options
| author | Deanna Garcia <deannagarcia@google.com> | 2022-12-28 19:47:16 +0000 |
|---|---|---|
| committer | Deanna Garcia <deannagarcia@google.com> | 2022-12-28 19:47:16 +0000 |
| commit | 8140241cca5e28febcb48802519da51f392afa21 (patch) | |
| tree | 5cfbca7cd358e594e1a02b02697aba30220fb216 | |
| parent | 8c543590a81277d30405d21d3c2a620c9318ab48 (diff) | |
| download | protobuf-8140241cca5e28febcb48802519da51f392afa21.tar.gz | |
Pin bundler for ruby 2.5 support
| -rwxr-xr-x | kokoro/release/ruby/macos/ruby/ruby_build_environment.sh | 3 | ||||
| -rwxr-xr-x | ruby/travis-test.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh index 3c625b6c1..026120719 100755 --- a/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh +++ b/kokoro/release/ruby/macos/ruby/ruby_build_environment.sh @@ -12,7 +12,8 @@ set -e # rvm commands are very verbose time rvm install 2.5.0 rvm use 2.5.0 gem install rake-compiler --no-document -gem install bundler --no-document +# Pin to bundler with ruby 2.5 support +gem install bundler -v 2.3.26 --no-document time rvm install 2.7.0 rvm use 2.7.0 --default gem install rake-compiler --no-document diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh index f7fa8155e..a673437ca 100755 --- a/ruby/travis-test.sh +++ b/ruby/travis-test.sh @@ -13,7 +13,8 @@ test_version() { "rvm install $version && rvm use $version && rvm get head && \ which ruby && \ git clean -f && \ - gem install --no-document bundler && bundle && \ + gem install --no-document bundler -v 2.3.26 && \ # Pin to bundler with ruby 2.5 support + bundle && \ rake test && \ rake gc_test && \ cd ../conformance && make test_jruby && \ |