diff options
| author | Jisi Liu <liujisi@google.com> | 2017-08-23 12:31:14 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-23 12:31:14 -0700 |
| commit | 364060bb51d172811395420026688409bcc7c74e (patch) | |
| tree | db1de9313040491ca72410ae7d7a61c17c1a4dfb | |
| parent | c44c3af2bcbb59fd2b2fd60b247429a2c19ec02b (diff) | |
| parent | e46caba1810c9dc07dce4b1d1dcf12f8e3a13bde (diff) | |
| download | protobuf-364060bb51d172811395420026688409bcc7c74e.tar.gz protobuf-364060bb51d172811395420026688409bcc7c74e.tar.bz2 protobuf-364060bb51d172811395420026688409bcc7c74e.zip | |
Merge pull request #3547 from matt-kwong/kokoro_mac_build
Remove pre-installed softwares from prebuild steps
| -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 |