Skip to content

Cherry pick #81976 to 25.6: Bump google-protobuf to v31.1#82631

Merged
robot-ch-test-poll merged 6 commits intobackport/25.6/81976from
cherrypick/25.6/81976
Jun 26, 2025
Merged

Cherry pick #81976 to 25.6: Bump google-protobuf to v31.1#82631
robot-ch-test-poll merged 6 commits intobackport/25.6/81976from
cherrypick/25.6/81976

Conversation

@robot-ch-test-poll
Copy link
Copy Markdown
Contributor

Original pull-request #81976

This pull-request is a first step of an automated backporting.
It contains changes similar to calling git cherry-pick locally.
If you intend to continue backporting the changes, then resolve all conflicts if any.
Otherwise, if you do not want to backport them, then just close this pull-request.

The check results does not matter at this step - you can safely ignore them.

Note

This pull-request will be merged automatically. Please, do not merge it manually (but if you accidentally did, nothing bad will happen).

Troubleshooting

If the PR was manually reopened after being closed

If this PR is stuck (i.e. not automatically merged after one day), check #81976 for pr-backports-created label and delete it.

Manually merging will do nothing. The pr-backports-created label prevents the original PR #81976 from being processed.

If the conflicts were resolved in a wrong way

If this cherry-pick PR is completely screwed by a wrong conflicts resolution, and you want to recreate it:

  • delete the pr-cherrypick label from the PR
  • delete this branch from the repository

You also need to check the original PR #81976 for pr-backports-created, and delete if it's presented there

The PR source

The PR is created in the CI job

@robot-ch-test-poll robot-ch-test-poll added pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only! do not test disable testing on pull request labels Jun 26, 2025
@robot-ch-test-poll robot-ch-test-poll merged commit fb83c7d into backport/25.6/81976 Jun 26, 2025
124 of 129 checks passed
@robot-ch-test-poll robot-ch-test-poll deleted the cherrypick/25.6/81976 branch June 26, 2025 03:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

do not test disable testing on pull request pr-cherrypick Cherry-pick of merge-commit before backporting. Do not use manually - automated use only!

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants