Merge #58891 #58893

58891: *: upgrade vendored protobuf to v3.9.2 r=rickystewart a=rickystewart 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. 58893: build: assert minimum bazel version in use r=rickystewart a=rickystewart Use `bazel_skylib`'s built-in functionality to assert the minimum supported Bazel version. We could also use `.bazelversion` to specify an *exact* version that must be used, but that seems unnecessarily restrictive. v3.5.0 was arbitrarily chosen as being probably "recent enough", but I did verify that a build does work with that version of Bazel. Fixes #56059. Release note: None Co-authored-by: Ricky Stewart <[email protected]>
cockroachdb · Jan 14, 2021 · 690c122 · 690c122
3 parents 80e6094 + f6b6675 + dadd5f1
commit 690c122
Show file tree

Hide file tree

Showing 94 changed files with 1,146 additions and 1,141 deletions.
diff --git a/WORKSPACE b/WORKSPACE
@@ -82,6 +82,11 @@ go_rules_dependencies()
 
 go_register_toolchains(go_version = "1.15.6")
 
+# NB: @bazel_skylib comes from go_rules_dependencies().
+load("@bazel_skylib//lib:versions.bzl", "versions")
+
+versions.check(minimum_bazel_version = "3.5.0")
+
 # Load gazelle dependencies.
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")
 
@@ -93,8 +98,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