Merge 22.x back to main after 22.0 release #11975
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
… version (#11728) PiperOrigin-RevId: 505829492
Downgrade ruby major version
Environment variables need to be accessed with the "env." prefix. PiperOrigin-RevId: 506147851
22.x 202302022046
Pull the first index with jq instead of looking for "main" Git add all artifacts since "git commit -a" doesn't add new ones PiperOrigin-RevId: 506933714
Cherrypick bug fixes to update PHP repo GHA.
Fix the macro PROTOBUF_LITTLE_ENDIAN cannot be set correctly on the l…
Manual cp of #11882 to 22.x PiperOrigin-RevId: 508400344
…es bad amalgamation update from bad merge.
Merge main to 22.x
22.x 202302102000
Delete codeowners file in release branch
PiperOrigin-RevId: 508680514
PiperOrigin-RevId: 508701071
Changes to these files *can't* be tested in forked PRs, so we should explicitly block them with an error message to explain why. PiperOrigin-RevId: 508701535
PiperOrigin-RevId: 508720169
deannagarcia
requested review from
esorot,
googleberg,
haberman,
jskeet,
perezd and
zhangskz
and removed request for
a team,
esorot,
googleberg,
haberman,
jskeet and
perezd
zhangskz
reviewed
Feb 16, 2023
version.json
Outdated
| "main": { | ||
| "protoc_version": "22-dev", | ||
| "22.x": { | ||
| "protoc_version": "22.1-dev", |
Member
There was a problem hiding this comment.
version.json is wrong and should maintain the previous main version.
| _github_archive( | ||
| name = "upb", | ||
| repo = "https://github.com/protocolbuffers/upb", | ||
| commit = "662497f1d3dcced2bba1620cea9aae8b484bd3cd", |
Member
There was a problem hiding this comment.
This isn't meant to be updated during merge either
fowles
approved these changes
Feb 16, 2023
zhangskz
approved these changes
Feb 16, 2023
bithium
pushed a commit
to bithium/protobuf
that referenced
this pull request
Sep 4, 2023
…2302161846 Merge 22.x back to main after 22.0 release
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 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.