From fdf6a302d109dd998a2061fa60e640636cec3b3c Mon Sep 17 00:00:00 2001 From: David Garcia Quintas Date: Mon, 4 Jun 2018 11:18:09 -0700 Subject: [PATCH] Add nanopb as an exception to sanity bazel workspace script --- tools/run_tests/sanity/check_bazel_workspace.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/run_tests/sanity/check_bazel_workspace.py b/tools/run_tests/sanity/check_bazel_workspace.py index fcffa22be40..ea670e42353 100755 --- a/tools/run_tests/sanity/check_bazel_workspace.py +++ b/tools/run_tests/sanity/check_bazel_workspace.py @@ -21,6 +21,7 @@ import os import re import subprocess import sys +import pdb os.chdir(os.path.join(os.path.dirname(sys.argv[0]), '../../..')) @@ -121,9 +122,12 @@ names_without_bazel_only_deps = names_and_urls.keys() for dep_name in _GRPC_BAZEL_ONLY_DEPS: names_without_bazel_only_deps.remove(dep_name) archive_urls = [names_and_urls[name] for name in names_without_bazel_only_deps] +# Exclude nanopb from the check: it's not a submodule for distribution reasons, +# but it's a workspace dependency to enable users to use their own version. workspace_git_hashes = { re.search(git_hash_pattern, url).group() for url in archive_urls + if 'nanopb' not in url } if len(workspace_git_hashes) == 0: print("(Likely) parse error, did not find any bazel git dependencies.")