diff options
| author |  Matt Kwong <matt-kwong@users.noreply.github.com> | 2017-10-09 12:09:06 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-10-09 12:09:06 -0700 |
| commit | 81138cb56c3059e48747846d91904611ba959375 (patch) | |
| tree | ee71e502899d00bc15d69fff8ec74ebe471297e2 | |
| parent | c56221f46c01e8c0155ee0c0ae4040791ff16a78 (diff) | |
| parent | 17acda35b775cb1dea076fe8692bfe7d5c8b2c63 (diff) | |
Merge pull request #12910 from matt-kwong/fix-macos-kokoro
Fix MacOS Kokoro builds
| -rw-r--r-- | tools/internal_ci/helper_scripts/prepare_build_macos_rc | 11 |
1 files changed, 6 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 b6cc43e0ab..8f2056096d 100644 --- a/tools/internal_ci/helper_scripts/prepare_build_macos_rc +++ b/tools/internal_ci/helper_scripts/prepare_build_macos_rc @@ -40,11 +40,12 @@ pip install google-api-python-client --user python export GOOGLE_APPLICATION_CREDENTIALS=${KOKORO_GFILE_DIR}/GrpcTesting-d0eeee2db331.json # If this is a PR using RUN_TESTS_FLAGS var, then add flags to filter tests -if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ] && [ -n "$RUN_TESTS_FLAGS" ]; then - brew install jq - ghprbTargetBranch=$(curl -s https://api.github.com/repos/grpc/grpc/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER | jq -r .base.ref) - export RUN_TESTS_FLAGS="$RUN_TESTS_FLAGS --filter_pr_tests --base_branch origin/$ghprbTargetBranch" -fi +# TODO(matt-kwong): enable after fixing brew issue +# if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ] && [ -n "$RUN_TESTS_FLAGS" ]; then +# brew install jq +# ghprbTargetBranch=$(curl -s https://api.github.com/repos/grpc/grpc/pulls/$KOKORO_GITHUB_PULL_REQUEST_NUMBER | jq -r .base.ref) +# export RUN_TESTS_FLAGS="$RUN_TESTS_FLAGS --filter_pr_tests --base_branch origin/$ghprbTargetBranch" +# fi set +ex # rvm script is very verbose and exits with errorcode source $HOME/.rvm/scripts/rvm |