ci(hotfix): cap auto-hotfix fan-out at 25.9, exclude main#2065
Merged
benflexcompute merged 1 commit intoJun 15, 2026
Merged
Conversation
The auto-hotfix workflow fanned a merged release-candidate PR out to main plus every higher-versioned release-candidate branch. With 25.10 now on remote, hotfixes would propagate to 25.10/main automatically, which is no longer wanted. Add a MAX_HOTFIX_VERSION cap (25.09, normalized YY.MM) and drop main from the target set. Only release-candidate branches above the PR base and at/below the cap receive hotfix PRs; higher branches are logged and skipped. Bump the env var to extend the cap to a newer line later. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
angranl-flex
approved these changes
Jun 15, 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
2 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.
Backport of #2064 to
release-candidate/25.9.Why this branch needs it
pull_request-triggered workflows run the workflow file from the base branch of the PR, not frommain. So #2064 (intomain) has no runtime effect on hotfix events — each RC branch runs its own copy. Without this backport, merging a PR into25.9still fans out tomainand25.10(both above the intended cap).With this change, a merge into
25.9produces no auto-hotfix targets (nothing above it should be hotfixed), andmainis excluded.Change
MAX_HOTFIX_VERSION: "25.09"cap env (bump to extend later).mainfromTARGET_BRANCHES.base < branch <= cap; above-cap branches logged + skipped.Scope: only
25.9is backported — older lines (25.2–25.8) are assumed to no longer receive merges.🤖 Generated with Claude Code
Note
Low Risk
Only GitHub Actions branch-selection logic changes; no runtime app or security paths are touched.
Overview
Narrows Create Hotfix PR so merges into
release-candidate/*no longer open auto-hotfixes onmainor on RC lines above a fixed ceiling.Adds
MAX_HOTFIX_VERSION: "25.09"(documented for bumping when a newer line should receive hotfixes).TARGET_BRANCHESstarts empty instead of always includingmain. Release-candidate targets must satisfy base version < branch version ≤ cap; newer RCs (e.g. 25.10+) are skipped with an explicit log line.For a merge into 25.9, there are typically no downstream RC targets, so the workflow should produce no auto-hotfix PRs unless a higher-but-capped branch exists.
Reviewed by Cursor Bugbot for commit 2f4fea8. Bugbot is set up for automated code reviews on this repo. Configure here.