diff options
author | Jisi Liu <liujisi@google.com> | 2017-08-23 12:37:47 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-23 12:37:47 -0700 |
commit | 92ea0d20ef3ec24732471fb177328d3e0983fc1f (patch) | |
tree | a36557f2241e96d3470d931423ae433c2264dbb3 | |
parent | 07de70ea2c91a6e31de896e8110e51e9c91e2903 (diff) | |
parent | 78432eab4341fd3f4ba5bdf05fbe26be98287137 (diff) | |
download | protobuf-92ea0d20ef3ec24732471fb177328d3e0983fc1f.tar.gz protobuf-92ea0d20ef3ec24732471fb177328d3e0983fc1f.tar.bz2 protobuf-92ea0d20ef3ec24732471fb177328d3e0983fc1f.zip |
Merge pull request #3556 from matt-kwong/kokoro_mac_v3
Remove pre-installed softwares
-rwxr-xr-x | kokoro/macos/prepare_build_macos_rc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kokoro/macos/prepare_build_macos_rc b/kokoro/macos/prepare_build_macos_rc index 2b9f4df2..dfe66ff8 100755 --- a/kokoro/macos/prepare_build_macos_rc +++ b/kokoro/macos/prepare_build_macos_rc @@ -17,8 +17,10 @@ export CXX=g++ # Install Brew and core softwares ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" +source $HOME/.rvm/scripts/rvm brew tap homebrew/homebrew-php -brew install autoconf automake ccache cmake gflags gpg gpg2 libtool maven node pcre php56 ruby wget +brew uninstall node icu4c +brew install gflags gpg gpg2 node pcre php56 ruby ## # Install Tox |