From 3c83ce518723023bd84727739d0f868da15ea7aa Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 24 Apr 2020 12:00:44 -0400 Subject: [PATCH 1/2] add back check removed by mistake in #15070 --- tools/run_tests/sanity/check_bazel_workspace.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py index 99252b717af..574551298da 100755 --- a/tools/run_tests/sanity/check_bazel_workspace.py +++ b/tools/run_tests/sanity/check_bazel_workspace.py @@ -170,6 +170,11 @@ if len(workspace_git_hashes - git_submodule_hashes) > 0: print( "Found discrepancies between git submodules and Bazel WORKSPACE dependencies" ) + print("workspace_git_hashes: %s" % workspace_git_hashes) + print("git_submodule_hashes: %s" % git_submodule_hashes) + print("workspace_git_hashes - git_submodule_hashes: %s" % + (workspace_git_hashes - git_submodule_hashes)) + sys.exit(1) # Also check that we can override each dependency for name in _GRPC_DEP_NAMES: From c6d788c395b8ddac4aebadf619db78f2bbec8ba4 Mon Sep 17 00:00:00 2001 From: Jan Tattermusch Date: Fri, 24 Apr 2020 12:01:33 -0400 Subject: [PATCH 2/2] add upb to _GRPC_BAZEL_ONLY_DEPS --- tools/run_tests/sanity/check_bazel_workspace.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py index 574551298da..6a01e71a9e1 100755 --- a/tools/run_tests/sanity/check_bazel_workspace.py +++ b/tools/run_tests/sanity/check_bazel_workspace.py @@ -68,6 +68,7 @@ _GRPC_DEP_NAMES = [ ] _GRPC_BAZEL_ONLY_DEPS = [ + 'upb', # third_party/upb is checked in locally 'rules_cc', 'com_google_absl', 'io_opencensus_cpp',