Skip to content

Commit

Permalink
Merge pull request #9109 from protocolbuffers/3.18.x
Browse files Browse the repository at this point in the history
Merge 3.18.x into master
  • Loading branch information
acozzette authored Oct 15, 2021
2 parents df5b7fa + 8a0aa4b commit d0a2c39
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion kokoro/macos/prepare_build_macos_rc
Original file line number Diff line number Diff line change
Expand Up @@ -33,5 +33,8 @@ if [[ "${KOKORO_INSTALL_RVM:-}" == "yes" ]] ; then
curl -sSL https://rvm.io/mpapis.asc | gpg --import -
curl -sSL https://rvm.io/pkuczynski.asc | gpg --import -

curl -sSL https://get.rvm.io | bash -s stable --ruby
# Old OpenSSL versions cannot handle the SSL certificate used by
# https://get.rvm.io, so as a workaround we download RVM directly from
# GitHub. See this issue for details: https://github.com/rvm/rvm/issues/5133
curl -sSL https://raw.githubusercontent.com/rvm/rvm/master/binscripts/rvm-installer | bash -s stable --ruby
fi

0 comments on commit d0a2c39

Please sign in to comment.