From c74b295c697329e6f1d715edc2d653e7d0de6a54 Mon Sep 17 00:00:00 2001
From: Stanley Cheung <stanleycheung@google.com>
Date: Wed, 27 May 2020 14:46:04 -0700
Subject: [PATCH] Trying to fix rvm brew update error

---
 .../helper_scripts/prepare_build_macos_rc         | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/tools/internal_ci/helper_scripts/prepare_build_macos_rc b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
index 755cad87bad..7e35f160010 100644
--- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc
+++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc
@@ -36,11 +36,17 @@ fi
 
 if [ "${PREPARE_BUILD_INSTALL_DEPS_RUBY}" == "true" ]
 then
-  set +ex  # rvm script is very verbose and exits with errorcode
-  # Advice from https://github.com/Homebrew/homebrew-cask/issues/8629#issuecomment-68641176
-  brew update && brew upgrade brew-cask && brew cleanup && brew cask cleanup
-  set -e  # rvm commands are very verbose
+  brew update
+  # special case for https://github.com/grpc/grpc/issues/23027
+  rm -f /usr/local/bin/gpg
+  rm -f /usr/local/bin/gpgconf
+  rm -f /usr/local/bin/gpgsm
+  brew upgrade gnupg
+  # end https://github.com/grpc/grpc/issues/23027
+  brew cleanup
+  set +ex
   source $HOME/.rvm/scripts/rvm
+  set -ex
   for RUBY_VERSION in 2.5.0 2.7.0; do
     rvm --debug requirements "ruby-${RUBY_VERSION}"
     time rvm install "$RUBY_VERSION"
@@ -51,7 +57,6 @@ then
   time gem install cocoapods --version 1.3.1 --no-document
   rvm osx-ssl-certs status all
   rvm osx-ssl-certs update all
-  set -ex
 fi
 
 if [ "${PREPARE_BUILD_INSTALL_DEPS_OBJC}" == "true" ]