Conversation
chore(repo): promote dev to main
Contributor
Author
|
Closing so back-merge.yml can create this itself, as an end-to-end test of the new BACKMERGE_TOKEN. The token was added minutes ago; the PR-creation path is the one that failed before, so it is worth proving rather than assuming. If the workflow cannot do it, I will reopen this. |
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.
Restores the invariant that
devcontainsmain.mainis 1 commit ahead:7f92970d8, the merge commit from promotion #2505. A promotion's own merge commit can never carry itself back, so every promotion re-opens this gap by exactly one commit.The diff is empty - GitHub reports 0 files changed.
mainbrings nothing todev; this exists solely sogit merge-base --is-ancestor main devpasses again, which is the check that distinguishes "everything is promoted" from "something reached main without passing through dev".Opened by hand because
back-merge.ymlcannot open it itself. Run 32859463041 fired correctly and reported:GITHUB_TOKENis refused becausecan_approve_pull_request_reviewsis false at both repository and organisation level. That setting should stay off: it also lets a workflow APPROVE pull requests. Adding aBACKMERGE_TOKENsecret (a PAT withpull-requests: write) makes this automatic - the workflow already prefers it when present.Merge with a merge commit, not a squash. A squash creates a new commit and leaves the ancestry broken, which is the problem this exists to fix.