ci: self-heal nightly-testing-green after a history rewrite#40586
Open
kim-em wants to merge 1 commit into
Open
ci: self-heal nightly-testing-green after a history rewrite#40586kim-em wants to merge 1 commit into
kim-em wants to merge 1 commit into
Conversation
PR summary 9b1c62f014Import changes for modified filesNo significant changes to the import graph Import changes for all files
|
fc66f95 to
ef3d526
Compare
The `nightly-testing-green` branch is advanced with a plain fast-forward push, which is rejected as non-fast-forward once `nightly-testing` history is rewritten (e.g. a toolchain reset to an rc). #38847 dropped the old `--force` and deferred recovery to a daily force-push job that never existed, so the branch stuck on v4.31.0-rc1 for weeks until it was force-pushed by hand. Force-push to recover, but only when the tested commit is at least as new as the current tip (by committer date), so an out-of-order CI completion still cannot roll it backwards. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
ef3d526 to
9b1c62f
Compare
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.
This PR makes the
nightly-testing-greenupdate innightly_detect_failure.ymlrecover from a history rewrite instead of freezing. The branch is advanced with a plain fast-forward push, which is rejected oncenightly-testinghistory diverges from its tip (for example a toolchain reset to an rc). #38847 dropped the originalgit push --forceand deferred recovery to a daily force-push job that does not exist, so the branch stuck onv4.31.0-rc1for weeks until it was force-pushed by hand.Fast-forward when possible, and otherwise force-push to recover, but only when the tested commit is strictly newer than the current tip by committer date, so an out-of-order CI completion can never roll the branch backwards.
nightly-testing-dailykeeps its fast-forward-or-skip behavior, and the stale comment referencing the nonexistent force-push job is corrected.🤖 Prepared with Claude Code