Merge 21.x release branch into main #10582
Merged
Conversation
This file contains hidden or 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
* Disabling broken mac php tests * Fix ruby permissions after Monterey upgrade * Install m4 via Homebrew * Adding ruby/python fixes to presubmits * Adding homebrew prefix command * More fixes for objc, python, and benchmark build * Properly disabling C++ benchmark warning * Use python 2 for testing * Splitting venv and python 2 * Setup tox-pyenv * Silencing more warnings * Cleanup * Upgrade python tests to 3.7 on mac * Switch to python 2 by default (googletest requires it) * Remove venv for python tests, use python 3.7 * Disable all compiler warnings for benchmark builds * Enable benchmark LTO to silence warnings * Fix locale issues in cocoapods * Remove benchmark build from C++ tests * Removing deprecated use_bazel command Removing python 3.6 mac build, since Monterey doesn't support it
Apply patch
Update versions for 21.6 release
Backport python release improvement
Update version.json to: 21.7-dev
zhangskz
approved these changes
Sep 15, 2022
bithium
pushed a commit
to bithium/protobuf
that referenced
this pull request
Sep 4, 2023
…2209142350 Merge 21.x release branch into main
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
No description provided.