*: upgrade vendored protobuf to v3.9.2 #58891
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
This change is |
rickystewart
force-pushed
the
upgrade_protobuf
branch
from
5b8e82b to
c26e83a
Compare
|
Fixed issues with |
rickystewart
force-pushed
the
upgrade_protobuf
branch
from
c26e83a to
1be4aa9
Compare
otan
approved these changes
Jan 13, 2021
otan
reviewed
Jan 13, 2021
go.sum
Outdated
| @@ -644,6 +644,7 @@ github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsT | |||
| github.com/prometheus/procfs v0.0.3/go.mod h1:4A/X28fw3Fc593LaREMrKMqOKvUAntwMDaekg4FpcdQ= | |||
| github.com/prometheus/procfs v0.0.10 h1:QJQN3jYQhkamO4mhfUWqdDH2asK7ONOI9MTWjyAxNKM= | |||
| github.com/prometheus/procfs v0.0.10/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= | |||
| github.com/protocolbuffers/protobuf v3.14.0+incompatible h1:8r0H76h/Q/lEnFFY60AuM23NOnaDMi6bd7zuboSYM+o= | |||
There was a problem hiding this comment.
(i think this should disappear since you removed the examples directory, if not curious about why this got added. what's the output of go mod why github.com/protocolbuffers/protobuf)?
There was a problem hiding this comment.
Ah, that's weird. Yeah, if I delete this make vendor_rebuild doesn't put it back I guess? I'll delete this line, re-push, and make sure it goes green again.
rickystewart
force-pushed
the
upgrade_protobuf
branch
3 times, most recently
from
33e8cd6 to
285e534
Compare
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 cockroachdb#58227. Release note (general change): Upgrade to v3.9.2 of `protobuf` to consume new changes for Bazel.
rickystewart
force-pushed
the
upgrade_protobuf
branch
from
285e534 to
f6b6675
Compare
|
bors r+ |
1 similar comment
|
bors r+ |
|
Already running a review |
|
Build succeeded: |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The old version of
protobufthat we had doesn't contain some utilitiesthat we need for Bazel (namely, the file
protobuf_deps.bzl), so moveto a more recent version. Also update
WORKSPACEso that our Bazelbuild uses the same version of
protobuf, and point to our fork ratherthan upstream.
Fixes #58227.
Release note (general change): Upgrade to v3.9.2 of
protobufto consume new changes for Bazel.