Skip to content

Commit 0770795

Browse files
Adam CozzetteTeBoring
authored andcommitted
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.
1 parent 34b6499 commit 0770795

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

kokoro/macos/prepare_build_macos_rc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/
2323
source $HOME/.rvm/scripts/rvm
2424
brew uninstall node icu4c cmake
2525
brew prune
26-
brew install gflags gpg gpg2 node pcre ruby cmake
26+
brew install gflags gpg gpg2 node openssl pcre ruby cmake
2727
sudo chown -R $(whoami) /usr/local
2828
brew postinstall node
2929

ruby/travis-test.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,11 @@ test_version() {
3636
cd ../ruby/compatibility_tests/v3.0.0 &&
3737
cp -R ../../lib lib && ./test.sh"
3838
else
39+
# Recent versions of OSX have deprecated OpenSSL, so we have to explicitly
40+
# provide a path to the OpenSSL directory installed via Homebrew.
3941
bash --login -c \
40-
"rvm install $version && rvm use $version && \
42+
"rvm install $version --with-openssl-dir=`brew --prefix openssl` && \
43+
rvm use $version && \
4144
which ruby && \
4245
git clean -f && \
4346
gem install bundler -v 1.17.3 && bundle && \

0 commit comments

Comments
 (0)