*: upgrade vendored protobuf to v3.9.2

The old version of `protobuf` that we had doesn't contain some utilities that we need for Bazel (namely, the file `protobuf_deps.bzl`), so move to a more recent version. Also update `WORKSPACE` so that our Bazel build uses the same version of `protobuf`, and point to our fork rather than upstream. Fixes #58227. Release note (general change): Upgrade to v3.9.2 of `protobuf` to consume new changes for Bazel.
cockroachdb · Jan 14, 2021 · f6b6675 · f6b6675
1 parent b22e903
commit f6b6675
Show file tree

Hide file tree

Showing 94 changed files with 1,141 additions and 1,141 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -93,8 +93,8 @@ gazelle_dependencies()
 #      https://github.com/bazelbuild/bazel-gazelle/issues/591
 git_repository(
     name = "com_google_protobuf",
-    commit = "09745575a923640154bcf307fba8aedff47f240a",
-    remote = "https://github.com/protocolbuffers/protobuf",
+    commit = "9b23a34c7275aa0ceb2fc69ed1ae6737b34656a3",
+    remote = "https://github.com/cockroachdb/protobuf",
 )
 
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")

diff --git a/c-deps/protobuf b/c-deps/protobuf
diff --git a/pkg/acceptance/cluster/testconfig.pb.go b/pkg/acceptance/cluster/testconfig.pb.go
diff --git a/pkg/blobs/blobspb/blobs.pb.go b/pkg/blobs/blobspb/blobs.pb.go
diff --git a/pkg/build/info.pb.go b/pkg/build/info.pb.go
diff --git a/pkg/ccl/backupccl/backup.pb.go b/pkg/ccl/backupccl/backup.pb.go
diff --git a/pkg/ccl/baseccl/encryption_options.pb.go b/pkg/ccl/baseccl/encryption_options.pb.go