ci(automerge): delegate to the fleet reusable automerge workflow - #14
Merged
Merged
Conversation
Replaces the hand-copied automerge logic with a thin caller to Emkraan/.github reusable-automerge.yml, which fixes the readied-draft stranding (apollo#1037) and ends per-repo drift.
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.
Summary
Replaces this repo's hand-maintained
automerge.ymlwith a thin caller to the fleet reusable workflowEmkraan/.github/.github/workflows/reusable-automerge.yml@main(Emkraan/.github#17). Only the triggers stay here. All merge logic now lives in one place and cannot drift.Why
13 repos had drifted into 5 automerge variants with 3 readiness rules. On repos gating on
CLEANonly, a draft marked ready after its checks went green stranded open: the running automerge job pins the PRUNSTABLE, native auto-merge is refused, and no later event fires (Emkraan/apollo#1037). The shared rule is:CLEAN, orUNSTABLEwhere every non-green check belongs to automerge itself. Non-required red checks still block. Verified live on Emkraan/.github#17, which was readied from draft and self-merged withUNSTABLE only from automerge itself.Changes in the caller
pull_requestgainsclosed, so linked issues are closed explicitly on merge (GitHub skips this for bot merges)issues: writeplus read-onlychecks,statusesandactions, for reading the check rollupworkflow_runlists every workflow in this repo that runs onpull_requestStandard: Apollo
docs/standards/github-repo-standard.mdSection 8.