fix: record every commit of a multi-commit hotfix set per environment - #260
Merged
Merged
Conversation
Signed-off-by: Joshua Temple <joshua.temple@stablekernel.com>
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
1 participant
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.
Problem
A hotfix that elevates a set of trunk commits recorded only the first commit in state..patches for each chain environment; the remaining commits were silently dropped. The live fleet surfaced this on a multi-commit hotfix.
Fix
The apply job now stamps the full comma-joined commit set in the Cascade-Hotfix-Source trailer, the context job recovers the whole set, and Finalize takes fixSHAs []string and appends all of them. The conflict-resolution path carries the full set through the same trailer. The single-commit path is unchanged (one value still produces one patch). No schema or manifest change.
Verification
New unit test TestFinalize_RecordsAllCommitsOfMultiCommitSet, a generator assertion on the full trailer, and a new e2e scenario (hotfix-multi-commit-clean) that cherry-picks two commits in one cycle and asserts both land in patches. Full suite, lint, and e2e build/vet green. The in-repo e2e is the regression guard (this is state-recording, reproducible under act+gitea); the 4env fleet step is the live counterpart.