diff options
| author | Adam Cozzette <acozzette@google.com> | 2019-03-25 17:19:48 -0700 |
|---|---|---|
| committer | Paul Yang <TeBoring@users.noreply.github.com> | 2019-03-25 17:19:48 -0700 |
| commit | 077079573f7777198e58676442978b9a8340b8a7 (patch) | |
| tree | a72591470f69650776743d29cd74a486d5a51785 | |
| parent | 34b64995ac24620c88333b84228adfe694921300 (diff) | |
| download | protobuf-077079573f7777198e58676442978b9a8340b8a7.tar.gz | |
Fixed CI failures with Ruby 2.3 on OSX (#5948)
OSX has deprecated OpenSSL, so we need to install it via Homebrew and
build against that version when we build Ruby.
| -rwxr-xr-x | kokoro/macos/prepare_build_macos_rc | 2 | ||||
| -rwxr-xr-x | ruby/travis-test.sh | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc index 7bbc12da4..6bf2025df 100755 --- a/kokoro/macos/prepare_build_macos_rc +++ b/kokoro/macos/prepare_build_macos_rc @@ -23,7 +23,7 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/ source $HOME/.rvm/scripts/rvm brew uninstall node icu4c cmake brew prune -brew install gflags gpg gpg2 node pcre ruby cmake +brew install gflags gpg gpg2 node openssl pcre ruby cmake sudo chown -R $(whoami) /usr/local brew postinstall node diff --git a/ruby/travis-test.sh b/ruby/travis-test.sh index 7c89e5468..cb53338f7 100755 --- a/ruby/travis-test.sh +++ b/ruby/travis-test.sh @@ -36,8 +36,11 @@ test_version() { cd ../ruby/compatibility_tests/v3.0.0 && cp -R ../../lib lib && ./test.sh" else + # Recent versions of OSX have deprecated OpenSSL, so we have to explicitly + # provide a path to the OpenSSL directory installed via Homebrew. bash --login -c \ - "rvm install $version && rvm use $version && \ + "rvm install $version --with-openssl-dir=`brew --prefix openssl` && \ + rvm use $version && \ which ruby && \ git clean -f && \ gem install bundler -v 1.17.3 && bundle && \ |