Merge 22.x back to main #12200
Merged
Merge 22.x back to main #12200
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
PiperOrigin-RevId: 509616839
Bazel has a 2 minute timeout for their internal `xcrun` call, which can be exceeded on our github runners about 5% of the time. This leads to flakes and opaque errors, but is a one-time cost. Subsequent xcruns finish in seconds, so we can just do an initial call w/o a timeout before running Bazel. With this change our total flake rate drops from ~30% to nearly 0% for our full suite of tests See bazelbuild/bazel#17437 for background. PiperOrigin-RevId: 509944178
This fixes some relatively harmless flakiness in our post-submit. If two commits are made within ~5 minutes of each other, the `git push` command will fail because the git workspace isn't up to date. PiperOrigin-RevId: 510165977
Chocolatey doesn't support any caching, so we're moving back to downloading the exe directly. This issue is responsible for a 5-10% flake rate in our windows cmake builds PiperOrigin-RevId: 510202223
Backport GHA improvements to 22.x
In 22.x, we accidentally omitted stripping the "src" import prefix for plugin.proto. We stripped the prefix in 21.x and for all other well known types in 22.x. This reverts that unintentional change.
In 21.x, depending on "//python:well_known_types_py_pb2" provided a transitive dependency to `compiler/plugin.proto`. That dependency was incorrectly removed for 22.x.
Strip "src" from file name of plugin.proto
Add plugin.proto to the list of well known files for python
Fix exit code on git commit which was preventing force-push and tagging from running even though these should work without a new commit. An empty commit is probably clearer anyways to show that sync has happened.
This addresses #12017. PiperOrigin-RevId: 511587640
Allow empty commits for update_php_repo
Add OSGi headers to pom files.
This should fix issue #11996. PiperOrigin-RevId: 511917449
Ensure VarintParseSlowArm{32,64} are exported with PROTOBUF_EXPORT
* Fix mutability bug in Java proto lite: sub-messages inside of oneofs were not being set as immutable. This would allow code to get a builder for a sub-message and modify the original (supposedly immutable) copy. PiperOrigin-RevId: 511598810 * Add casts to make protobuf compatible with Java 1.8 runtime. Fix for: #11393 PiperOrigin-RevId: 511807920 --------- Co-authored-by: Protobuf Team Bot <[email protected]>
Add java8 tests and build flags
PiperOrigin-RevId: 512960332
zhangskz
requested review from
haberman,
googleberg and
jtattermusch
and removed request for
a team
mkruskal-google
approved these changes
Mar 10, 2023
zhangskz
requested review from
a team and
acozzette
and removed request for
a team,
haberman,
googleberg,
jtattermusch and
acozzette
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.
No description provided.