Repository navigation
👷 QD-17036 Add backport workflow for release branches - #1138
Merged
Merged
Conversation
Label a merged PR with 'backport <branch>' (before or after merging) or comment /backport to open cherry-pick PRs into release branches. PRs are created by qodana-release-bot, so required checks run and approval is still needed.
Codex Review Summary: ✅ CompletedThis comment shows the latest Codex review activity on this pull request.
ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings. |
Qodana for Go127 new problems were found
@@ Code coverage @@
+ 65% total lines covered
10631 lines analyzed, 6980 lines covered
# Calculated according to the filters of your coverage tool☁️ View the detailed Qodana report Contact Qodana teamContact us at qodana-support@jetbrains.com
|
Jakub Andrzejewski (bonepl)
approved these changes
Nov 13, 2026
Ivan Efimov (ivanovec)
changed the title
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
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.
Pull Request Details
Description
Adds
.github/workflows/backport.ymlbased onkorthout/backport-action(pinned to v5.0.0 by SHA).How to use:
backport 261/backport 262/backport 263label to a PR (several can be added at once), before or after it is merged. Works for already merged PRs too.For each target branch the action cherry-picks the merged commits (
-x, squash/rebase/merge detected automatically) intobackport-<pr>-to-<branch>and opens a PR titled<original title> (<branch>), assigned to the original author. On a conflict it comments on the original PR with instructions for a manual cherry-pick.Details:
qodana-release-botApp token (GH_APP_ID/GH_APP_PRIVATE_KEY, already used bypost-release.yml), notGITHUB_TOKEN, so the required checks run on backport PRs. Approval rules are unchanged.labeled, only the newly added label is backported, so adding a second label doesn't retry the first one.mainfirst.main:pull_request_targetuses the PR's base branch.Related Issue
QD-17036
Motivation and Context
All changes to
mainand release branches go through approved PRs, and fixes are backported by hand to 261/262/263 (e.g. QD-16607, QD-15581, QD-16860, QD-15746). GitHub has no UI cherry-pick, so this automates it.After merge (repo settings):
backport 261,backport 262,backport 263.pull_request_targeton public repositories unless an Actions policy allows it: add a policy for.github/workflows/backport.ymlallowingpull_request_target.How Has This Been Tested
actionlint1.7.12: clean.pull_request_targetworkflows only run from the default branch. First check after merge: label a merged PR withbackport 263and verify the App token is issued forqodana-cliand checks start on the backport PR.Types of changes