[ML] Re-enable auto-merge for backport PRs (gated on required CI rollup)#3122
Merged
Merged
Conversation
Reverts the temporary disable from elastic#3114. Auto-merge is now safe because main and the release branches require the buildkite/ml-cpp-pr-builds rollup status, which reflects the whole build/test matrix (including async: false QA/PyTorch downstream triggers). 'gh pr merge --auto --squash' therefore waits for CI to go green and the review requirement to be met before merging; if CI never runs or fails, the PR stays open (fail-safe). Approval is still posted by github-actions[bot] (distinct from the ephemeral-token author), satisfying the one-review ruleset on release branches. Co-authored-by: Cursor <cursoragent@cursor.com>
|
Pinging @elastic/ml-core (Team:ML) |
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
2 participants
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
Re-enables auto-merge for auto-backport PRs, reverting the temporary disable in #3114.
#3114 disabled
gh pr merge --autobecause, at the time, the release branches did not require the ml-cpp build/test checks — so auto-merge would merge a backport as soon as the lightweight checks (CLA, snyk) passed, before the C++ matrix finished (this actually happened with #3106–#3111).That gap is now closed:
buildkite/ml-cpp-pr-builds(publish_commit_status=True).buildkite/ml-cpp-pr-buildsis now a required status check onmainand on9.5/9.4/8.19.triggersteps areasync: false, so a downstream failure propagates into the parent build and hence the rollup.So
gh pr merge --auto --squashnow waits for CI to be green (and the one-review requirement to be met) before merging. If CI never runs or fails, the PR just stays open — fail-safe.Approval continues to be posted by
github-actions[bot](a distinct identity from the ephemeral-token PR author), satisfying the org "[org] Require a PR" ruleset on the release branches.Related: #3099 (CI-trigger fix #3103), #3112 (set_commit_status), #3114 (temporary disable).
Test plan
>bugPR carrying version +auto-backportlabels.github-actions[bot]and has auto-merge armed.buildkite/ml-cpp-pr-buildsrollup goes green (not before).