diff options
author | Muxi Yan <mxyan@google.com> | 2018-02-05 13:47:31 -0800 |
---|---|---|
committer | Muxi Yan <mxyan@google.com> | 2018-02-05 13:47:31 -0800 |
commit | 3cb1b0aa2f92d3d71618c55db33c35fd50bd9607 (patch) | |
tree | aa2340d9989d9294b8516ee8cbbc3f3f43e7f1e1 | |
parent | 3ac5b1b5d5155b99a91deffc35a2207e2df888c9 (diff) |
Partial revert PR#14042
-rwxr-xr-x | Rakefile | 9 | ||||
-rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_macos_rc | 6 |
2 files changed, 3 insertions, 12 deletions
@@ -99,7 +99,7 @@ task 'dlls' do env_comp = "CC=#{opt[:cross]}-gcc " env_comp += "CXX=#{opt[:cross]}-g++ " env_comp += "LD=#{opt[:cross]}-gcc " - docker_for_windows "gem update --system --no-ri --no-doc && #{env} #{env_comp} make -j #{out} && #{opt[:cross]}-strip -x -S #{out} && cp #{out} #{opt[:out]}" + docker_for_windows "gem update --system && #{env} #{env_comp} make -j #{out} && #{opt[:cross]}-strip -x -S #{out} && cp #{out} #{opt[:out]}" end end @@ -113,15 +113,10 @@ task 'gem:native' do if RUBY_PLATFORM =~ /darwin/ FileUtils.touch 'grpc_c.32.ruby' FileUtils.touch 'grpc_c.64.ruby' - unless '2.5' == /(\d+\.\d+)/.match(RUBY_VERSION).to_s - fail "rake gem:native (the rake task to build the binary packages) is being " \ - "invoked on macos with ruby #{RUBY_VERSION}. The ruby macos artifact " \ - "build should be running on ruby 2.5." - end system "rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}" else Rake::Task['dlls'].execute - docker_for_windows "gem update --system --no-ri --no-doc && bundle && rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}" + docker_for_windows "gem update --system && bundle && rake cross native gem RUBY_CC_VERSION=2.5.0:2.4.0:2.3.0:2.2.2:2.1.6:2.0.0 V=#{verbose} GRPC_CONFIG=#{grpc_config}" end end diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc index 3a09701a30..bd8c8eb032 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -50,11 +50,7 @@ fi set +ex # rvm script is very verbose and exits with errorcode 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 bundler --no-ri --no-doc -gem install cocoapods --version 1.3.1 --no-ri --no-doc -gem install rake-compiler --no-ri --no-doc +rvm use ruby-2.4 rvm osx-ssl-certs status all rvm osx-ssl-certs update all set -ex |