Skip to content

ci: remove the automatic release back-merge - #5179

Merged
kixelated merged 2 commits into
mainfrom
ci/remove-back-merge
Oct 10, 2026
Merged

kixelated merged 2 commits into
mainfrom
ci/remove-back-merge

Conversation

@kixelated

@kixelated kixelated commented Oct 10, 2026 •

Copy link
Copy Markdown
Collaborator

Problem

Every push to release opens a PR merging release back into main, landed by Check's land job as a moq-bot --admin merge commit. That machinery needs a bot bypass on the planned squash queue, a workflows permission for moq-bot, and an unreviewed path past the queue. The maintainer decided (2026-10-10) it isn't worth it:

remove it, we can just cherry pick from main to release

once merge release into main before a semver release

Approach

  • Delete .github/workflows/back-merge.yml, sh/gh/back-merge.sh, the just gh back-merge recipe, Check's land job, and the Back-merge entry in alert.yml.
  • CONTRIBUTING.md: fixes still land on main and are cherry-picked onto release. Nothing merges release into main automatically; before a minor or breaking release, the maintainer merges release into main once, as a merge commit with --admin (the only allowed queue bypass), then cuts as today.
  • Quests: delete quest/m1/bot-workflows-permission.md (moq-bot no longer pushes back-merges). Rewrite quest/m1/merge-queue-settings.md: ruleset 2420853 still has no merge_queue rule, so the squash queue stays pending, but the moq-bot pull_request bypass is dropped. Reword the back-merge note in quest/m0/broadcast-epoch/README.md for the manual pre-release merge.

Ordering

Gate cleared: back-merge #5176 merged at 2026-10-10T05:33Z, and this branch now includes it (main merged in).

The backport removing release's copy of the workflow is #5180, against release. Until it lands, a push to release still opens a back-merge PR that nothing lands; close it, or fold it into the pre-release merge.

Impact

  • No public API or wire change. CI and process only.

Alternatives

  • Keep the back-merge and finish the bot bypass and workflows permission: rejected by the maintainer.

Follow-ups

  • quest/m1/merge-queue-settings.md: the maintainer still enables the squash queue on main.

(Written by Claude Opus 5.5)

🤖 Generated with Claude Code

Fixes are cherry-picked from main onto release, and the maintainer merges
release into main once before each semver release, as a merge commit with
--admin. Drop the Back-merge workflow, its script and recipe, Check's land
job, and the Alert entry, and update CONTRIBUTING and the quests.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
@kixelated
kixelated marked this pull request as ready for review October 10, 2026 12:27
@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 10, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-10T12:31:29.467830Z a9db60d Draft marked ready
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@coderabbitai

coderabbitai Bot commented Oct 10, 2026

Copy link
Copy Markdown
Contributor

Review in Change Stack →

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration
  • Configuration used: Organization UI
  • Review profile: CHILL
  • Plan: Advanced
  • Run ID: c378f46c-7110-4eff-a2cc-d473332ac630

📥 Commits

Reviewing files that changed from the base of the PR and between fb0e34d and a9db60d.


📒 Files selected for processing (10)
  • .github/justfile
  • .github/workflows/alert.yml
  • .github/workflows/back-merge.yml
  • .github/workflows/check.yml
  • CONTRIBUTING.md
  • quest/m0/broadcast-epoch/README.md
  • quest/m1/README.md
  • quest/m1/bot-workflows-permission.md
  • quest/m1/merge-queue-settings.md
  • sh/gh/back-merge.sh

💤 Files with no reviewable changes (6)
  • .github/justfile
  • .github/workflows/back-merge.yml
  • .github/workflows/check.yml
  • .github/workflows/alert.yml
  • sh/gh/back-merge.sh
  • quest/m1/bot-workflows-permission.md

Included review availability: This review used your included allowance. Your plan provides up to 4 included reviews per hour; 0 remain after this review.



Walkthrough

The pull request removes the automated release-to-main back-merge script, recipe, and workflows. Contributor guidance now describes a maintainer-triggered, non-squashed merge before a minor or breaking release. Quest documentation updates the squash merge queue requirements and removes the bot-workflow permission quest.

Priority: ➖ Normal

Merge Risk: ⚪ Minimal · up to a9db6

The change replaces back-merge automation with a documented manual merge before minor or breaking releases. No established issue prevents merging.

Pre-merge checks | Passed 5
✅ Passed checks (5 passed)
Check name Status Explanation
Title check Passed The title clearly and concisely identifies the main change: removing the automatic release back-merge process.
Description check Passed The description is directly related to the changeset and explains the problem, implementation, release process, impact, and follow-up work.
Docstring Coverage Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 0…
Linked Issues check Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check Passed Check skipped because no linked issues were found for this pull request.

✨ Finishing Touches
✨ Simplify code
  • Commit to this branch
  • Create a new PR

  • Autofix · Keep fixing CodeRabbit findings and required CI, and resolving merge conflicts

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@kixelated

Copy link
Copy Markdown
Collaborator Author

Merge summary:

(Written by Claude Opus 5.5)

@kixelated
kixelated merged commit 2d7c67d into main Oct 10, 2026
5 checks passed
@kixelated
kixelated deleted the ci/remove-back-merge branch October 10, 2026 12:34
kixelated added a commit that referenced this pull request Oct 10, 2026
ci: remove the automatic release back-merge (backport #5179)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant