fix(open-knowledge): prevent beta-base collision after stable promotion#268
Merged
Conversation
…on (#2104) After a stable is promoted, the beta cycle anchor in pre.json trails the just-shipped stable until main-reset advances it (a cross-repo PR plus Copybara round-trip). Any feature mirror push that lands in that window makes release.yml compute a beta base equal to the fresh stable, tripping the "beta base must lead the latest stable" guard with a red, paging failure even though the condition is transient and self-healing. It got worse when the main-reset PR was ejected from the merge queue without re-enqueuing, stranding the anchor advance and stretching the window to 25+ minutes until a manual admin merge. Two levers: 1. release.yml compute-beta now DEFERS instead of failing when the computed base equals the latest stable: it skips the cut with a loud warning and re-cuts automatically once the anchor leads. The Guard step is narrowed to a backstop for a base strictly BEHIND stable (genuine drift), which stays a hard failure. 2. main-reset.yml lands its bot PR with a direct admin merge instead of riding the merge queue, collapsing the race window to about a minute and removing the queue-eject failure mode. It falls back to queued auto-merge if the token cannot bypass, so it never hard-fails. Lever 2's admin path activates only once the inkeep-internal-ci app is a bypass actor on main's ruleset; until then it falls back to today's behavior. Lever 1 is effective immediately and needs no permission grant. GitOrigin-RevId: 2686a67bc9a06cdc39cbfe60c6b1c333b65135de
![inkeep-internal-ci[bot]](https://avatars.githubusercontent.com/in/2806322?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Automated approval from agents-private public-mirror-sync (run: https://github.com/inkeep/agents-private/actions/runs/28190197637). Source of truth is the monorepo; direct edits on inkeep/open-knowledge are overwritten on next sync.
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.
No description provided.