Repository navigation
automation: propose a 6.18-lts backport for each merged mainline PR - #21
Merged
Merged
Conversation
Every pull request merged into edera/mainline flows down to edera/6.18-lts as its own backport pull request, unless it is labelled no-backport. lts-backport-trigger.yml on edera/mainline dispatches kernel-nightly.yml here with backport_pr=<N>, which runs lts-backport.yml: - prepare works out which of the pull request's commits the LTS tree still lacks (pending-backports.sh, backport-blockers.sh), and holds it back with a backport-waiting label while an earlier pending Edera commit touches the same files, so interdependent patches land in mainline order; - Claude cherry-picks the commits with -x, adapting them to 6.18 where needed, following .automation/skills/mainline-backport/SKILL.md, and can also declare a dependency a file match cannot see; - verify-backport.sh and x86_64/arm64 builds judge the result; - publish always opens (or refreshes) backport/edera-6.18-lts/pr-<N>, never pushes edera/6.18-lts, and keeps one status comment on the mainline pull request. Waiting backports are retried when a backport merges here (lts-backport-merged.yml) and after each nightly rebase, which also re-prepares open backport pull requests the rebase made unmergeable (retry-backports.sh). A backport whose base was rebased away while it ran dispatches itself again.
azenla
approved these changes
Oct 9, 2026
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.
Every PR merged into
edera/mainlinegets its own proposed backport PR intoedera/6.18-lts, unless it carries theno-backportlabel. All of this runs onedera/6.18-lts. The mainline side is only a trigger (companion PR), which runs this tree'skernel-nightly.ymlwithbackport_pr=<N>.Flow for one mainline PR
.automation/backport-skip, and commits from PRs labelledno-backport.backport-waitingand Claude doesn't run.-xonto the 6.18-lts tip and adapts them where 6.18 differs. It builds, then writes a report. It can also declare a dependency that the file check misses (Status: waiting).verify-backport.shchecks that the result is the tip plus exactly these commits, in order, each with its source's title and +/- lines. Then x86_64 and arm64 builds.backport/edera-6.18-lts/pr-<N>, and never pushesedera/6.18-lts.backport-needs-attentioninstead.Retries and refreshes
backport-waitingmainline PR is dispatched again (lts-backport-merged.yml).retry-backports.sh --stale).Checked locally
Not yet exercised on GitHub
The workflows themselves haven't run yet.
backport_prinput that mainline'skernel-nightly.ymllacks. I expect it to check this branch's copy of the file.A manual run with
backport_pr= 7 would exercise all of it.