Merge 3.20.x into master #9604
Merged
Merge 3.20.x into master #9604
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
The JRuby test runs appear to be fetching the util package from Maven Central because it is not being installed locally. This causes the tests to fail when we upgrade to a new version that has not yet been published to Maven Central. This commit fixes the problem by locally installing all the protobuf packages, not just util.
We tried increasing it to 3.10, but that turned out to be too high since gRPC still supports 3.5.1.
* Support older versions of CMake. VERSION_GREATER_EQUAL is supported by CMake >=3.7: https://cmake.org/cmake/help/latest/command/if.html#version-greater-equal target_link_options() is supported by CMake >=3.13: https://cmake.org/cmake/help/latest/command/target_link_options.html * Use PROTOBUF_USE_DLLS and LIBPROTOC_EXPORTS for libprotoc.so shared library Similar change for libprotobuf.so and libprotobuf-lite.so was made in commit 5a0887f. * Make value of PROTOC_EXPORT dependent on LIBPROTOC_EXPORTS instead of LIBPROTOBUF_EXPORTS This was probably intention, and LIBPROTOC_EXPORTS is also used above in _MSC_VER branch.
…ted memory for Arenas. (#9586) * Add ruby-specific upb_alloc using xrealloc/xfree for use in Arena_alloc so Ruby GC is aware of allocated memory. * Add RB_GC_GUARD to DescriptorPool_add_serialized_file to ensure ruby does not aggressively garbage collect arena_rb due to lack of references.
Merge master into 3.20.x
haberman
approved these changes
Mar 8, 2022
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 3.20.x branch has a few important fixes on it, so let's merge it back to master. This will also unblock the work on #9603.