Repository navigation
fix: reset live ci.state so staging is non-diverged before promote - #53
Merged
Merged
Conversation
Signed-off-by: Joshua Temple <joshua.temple@stablekernel.com>
Contributor
Cascade plan previewThis merge would:
|
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: the suite's promote step failed preflight with "cannot promote from diverged environment staging" on rc v0.3.0-rc.20. The rollback-check job leaves ci.state.staging.ref=rollback/staging on trunk, and the reset job's yq '.config.state = {}' cleared a vestigial config.state map, never the live .ci.state the generators read, so the divergence bled into the next run.
Fix: reset state with cascade reset --state --push (the idiom the 3env/4env suites already use), which clears all of .ci.state including staging's divergence. Added the setup-cli step (pinned v0.2.1, matching the sibling suites) to the reset job and replaced the stale commit-message verify with an assertion that .ci.state is empty after reset.
Verification: actionlint clean; YAML parses; reset now clears staging divergence before promote-staging checks out main, so the real promote path is exercised. The promote-from-diverged check is unchanged.