Fix protoc mismatch error (#1456)
diff --git a/api_proto/BUILD.bazel b/api_proto/BUILD.bazel
index bec6993..98187c5 100644
--- a/api_proto/BUILD.bazel
+++ b/api_proto/BUILD.bazel
@@ -7,6 +7,7 @@
 
 go_proto_checkedin_test(
     src = "api.gen.pb.go",
+    allowed_diffs = ["^[[:space:]]*//.*protoc"],
 )
 
 proto_library(
diff --git a/build/build_defs.bzl b/build/build_defs.bzl
index 6a27dde..2a2c489 100644
--- a/build/build_defs.bzl
+++ b/build/build_defs.bzl
@@ -82,18 +82,24 @@
 )
 
 # buildifier: disable=unnamed-macro
-def genfile_check_test(src, gen):
+def genfile_check_test(src, gen, allowed_diffs = []):
     """
     Asserts that any checked-in generated code matches bazel gen.
 
     Args:
       src: checked in file
       gen: generated file
+      allowed_diffs: optional list of regexes to ignore in diff
     """
     if not src:
         fail("src is required", "src")
     if not gen:
         fail("gen is required", "gen")
+
+    diff_args = ""
+    for d in allowed_diffs:
+        diff_args += " -I '%s'" % d
+
     native.genrule(
         name = src + "_checksh",
         outs = [src + "_check.sh"],
@@ -128,9 +134,9 @@
 [[ "$$2" = external/* ]] && F2="$${2#external/}" || F2="$$TEST_WORKSPACE/$$2"
 F1="$$(rlocation "$$F1")"
 F2="$$(rlocation "$$F2")"
-diff -q "$$F1" "$$F2"
+diff -q%s "$$F1" "$$F2"
 eof
-""",
+""" % diff_args,
     )
     sh_test(
         name = src + "_checkshtest",
@@ -156,13 +162,14 @@
     )
 
 # buildifier: disable=unnamed-macro
-def go_proto_checkedin_test(src, proto = "go_default_library"):
+def go_proto_checkedin_test(src, proto = "go_default_library", allowed_diffs = []):
     """
     Asserts that any checked-in .pb.go code matches bazel gen.
 
     Args:
       src: checked in file
       proto: generated file
+      allowed_diffs: optional list of regexes to ignore in diff
     """
     genfile = src + "_genfile"
     extract_go_src(
@@ -177,4 +184,4 @@
         outs = [genfile + ".go"],
         cmd = "cp $< $@",
     )
-    genfile_check_test(src, genfile)
+    genfile_check_test(src, genfile, allowed_diffs = allowed_diffs)
diff --git a/build_proto/BUILD.bazel b/build_proto/BUILD.bazel
index c08a4fa..a275922 100644
--- a/build_proto/BUILD.bazel
+++ b/build_proto/BUILD.bazel
@@ -10,6 +10,7 @@
 
 go_proto_checkedin_test(
     src = "build.gen.pb.go",
+    allowed_diffs = ["^[[:space:]]*//.*protoc"],
 )
 
 proto_library(
diff --git a/deps_proto/BUILD.bazel b/deps_proto/BUILD.bazel
index fe8dca2..2bfdd89 100644
--- a/deps_proto/BUILD.bazel
+++ b/deps_proto/BUILD.bazel
@@ -10,6 +10,7 @@
 
 go_proto_checkedin_test(
     src = "deps.gen.pb.go",
+    allowed_diffs = ["^[[:space:]]*//.*protoc"],
 )
 
 proto_library(
diff --git a/extra_actions_base_proto/BUILD.bazel b/extra_actions_base_proto/BUILD.bazel
index 9ae226b..110cc7f 100644
--- a/extra_actions_base_proto/BUILD.bazel
+++ b/extra_actions_base_proto/BUILD.bazel
@@ -10,6 +10,7 @@
 
 go_proto_checkedin_test(
     src = "extra_actions_base.gen.pb.go",
+    allowed_diffs = ["^[[:space:]]*//.*protoc"],
 )
 
 proto_library(