-
Notifications
You must be signed in to change notification settings - Fork 15.5k
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 CMake configuration to add a dependency on Abseil #9793
Update CMake configuration to add a dependency on Abseil #9793
Conversation
(cherry picked from commit 58e320a)
All synthetic methods implemented by `method_missing` are now supported by `respond_to?`. Fixes issue protocolbuffers#9202. * Fix null pointer exceptions exposed by new regression tests. * Fix clear_ on oneofs so that it is safe to call repeatedly and so that respond_to? does not depend on whether the oneof is currently cleared. * Code cleanup: reenable more tests on JRuby. * Align JRuby behavior with CRuby by throwing a RuntimeError when attempting to assign to a oneof. (cherry picked from commit 8e7f936)
Cherry pick JRuby changes that fix NPE during encoding (protocolbuffers#9507) and implements respond_to? (protocolbuffers#9202) into 3.20.x.
…hp-extension Fix building packaged PHP extension (cherry picked from commit 7f9901c)
…obuf into mkruskal-google-3.20.x-202204051705
Merge 3.20.1-rc1 into main
… broken for automake and bazel
…ake version < 3.13)
@@ -30,7 +30,7 @@ git clone https://github.com/matthew-brett/multibuild.git | |||
# silently creeping in (see https://github.com/protocolbuffers/protobuf/issues/9180). | |||
# IMPORTANT: always pin multibuild at the same commit for: | |||
# - linux/build_artifacts.sh | |||
# - linux/build_artifacts.sh | |||
# - macos/build_artifacts.sh |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Were these changes meant to be included? I think this PR must have been based on the 3.20.x branch because it seems to be including some commits that are on 3.20.x but haven't been merged to main yet.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No this was based on main. I just came across these and got confused, and thought I should update them
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah ok, I see. It's still strange that a bunch of unrelated commits show up here: https://github.com/protocolbuffers/protobuf/pull/9793/commits But I guess if you do "squash and merge" then it won't matter.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ah yea I think I was originally off of 3.20.x and switched to main in commit 72c6de8. Squash and merge should keep it hidden though :)
This PR appears to have broken the Kokoro release artifacts job (eg. https://fusion.corp.google.com/projectanalysis/summary/kokoro/prod%3Aprotobuf%2Fgithub%2Fmaster%2Frelease%2Fprotoc%2Fwindows%2Frelease)
|
…tocolbuffers#9793)" This reverts commit e9246cd.
…tocolbuffers#9793)" This reverts commit e9246cd.
* Rolling #9793 forward * Removing private label on conformance linkage * no-op comment added
This is the most recent Abseil LTS branch, from November 2021. We do not yet use Abseil for anything, but this change will make it possible to start using it in CMake when we're ready. This PR was tested by confirming that using absl::string_view from protobuf::Message doesn't break anything (under CMake builds only).