-
Notifications
You must be signed in to change notification settings - Fork 4.1k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update Protobuf to 3.11.3 #10651
Update Protobuf to 3.11.3 #10651
Conversation
(I'll hold off reviewing this until #10648 lands) |
I think all dependencies of this are merged now! |
6d0ffd1
to
5a74ce0
Compare
We're mostly there! #10723 adds a patch for Protobuf to use the existing references for zlib, six, guava, ... When that landed, I'll rebase this PR (already verified locally that it works) and merge, and as a last change we get to delete the vendored version of Protobuf 😃. |
b494f2c
to
a467720
Compare
Hi @Yannic, just saw the failed tests here with this message:
You can fix this with a little tweak:
Then it should work! |
d0303aa
to
a28d598
Compare
@philwo Thanks! That fixed the skylib error. Unfortunately, there is a new error because of zlib being referenced as |
Mhm... yeah, I'm not sure how to solve that. What's the reason that we're patching the references to If we change this: https://github.com/bazelbuild/bazel/blob/master/WORKSPACE#L59-L62 to: local_repository(
name = "six",
path = "./third_party/py/six/",
) and add one for zlib: local_repository(
name = "zlib",
path = "./third_party/zlib/",
) Maybe it works? |
a28d598
to
32e7cdc
Compare
32e7cdc
to
d9f873c
Compare
Finally figured it out. I think the problem was actually that bash didn't like the use of ` in a comment. Also, I'm not sure why, but adding |
@Yannic We're done!! 🎉 Thank you so much for this contribution and your hard work through the little issues and blockers :) |
These files are no longer needed since Protobuf was upgrade to 3.11.3 in bazelbuild#10651.
These files are no longer needed since Protobuf was upgrade to 3.11.3 in bazelbuild#10651.
These files are no longer needed since Protobuf was upgrade to 3.11.3 in #10651. Partial commit for third_party/*, see #10784. Signed-off-by: Philipp Wollermann <[email protected]>
No description provided.