Skip to content

Commit

Permalink
Fix brew install issue; enable MacOS test filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
matt-kwong authored and Muxi Yan committed Oct 25, 2017
1 parent e18928a commit c91983d
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions tools/internal_ci/helper_scripts/prepare_build_macos_rc
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,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
# 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
if [ -n "$KOKORO_GITHUB_PULL_REQUEST_NUMBER" ] && [ -n "$RUN_TESTS_FLAGS" ]; then
brew update
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
Expand Down

0 comments on commit c91983d

Please sign in to comment.