Skip to content

Commit

Permalink
Update Xcode version needed to run Kokoro tests and replace deprecate…
Browse files Browse the repository at this point in the history
…d rubygem options (#6890)

* Update Xcode version needed to run Kokoro tests

* Replace deprecated --no-ri --no-rdoc rubygem options with --no-document
  • Loading branch information
rafi-kamal committed Nov 14, 2019
1 parent 601f696 commit bb0c543
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
9 changes: 5 additions & 4 deletions kokoro/macos/prepare_build_macos_rc
Expand Up @@ -5,10 +5,11 @@
##
# Select Xcode version

# Remember to udpate the Xcode version when xcode_9.4.1 is not available.
# If xcode is not available, it will probaly encounter the failure for
# "autom4te: need GNU m4 1.4 or later: /usr/bin/m4""
export DEVELOPER_DIR=/Applications/Xcode_9.4.1.app/Contents/Developer
# Remember to udpate the Xcode version when Xcode_11.0.app is not available.
# If xcode is not available, it will probaly encounter the failure for
# "autom4te: need GNU m4 1.4 or later: /usr/bin/m4"
# go/kokoro/userdocs/macos/selecting_xcode.md for more information.
export DEVELOPER_DIR=/Applications/Xcode_11.0.app/Contents/Developer

##
# Select C/C++ compilers
Expand Down
5 changes: 2 additions & 3 deletions kokoro/release/ruby/macos/ruby/ruby_build_environment.sh
Expand Up @@ -7,8 +7,8 @@ source $HOME/.rvm/scripts/rvm
set -e # rvm commands are very verbose
time rvm install 2.5.0
rvm use 2.5.0 --default
gem install rake-compiler --no-ri --no-doc
gem install bundler --no-ri --no-doc
gem install rake-compiler --no-document
gem install bundler --no-document
rvm osx-ssl-certs status all
rvm osx-ssl-certs update all
set -ex
Expand Down Expand Up @@ -54,4 +54,3 @@ done

sed 's/x86_64-darwin-11/universal-darwin/' ~/.rake-compiler/config.yml > "$CROSS_RUBY"
mv "$CROSS_RUBY" ~/.rake-compiler/config.yml

0 comments on commit bb0c543

Please sign in to comment.