Evergreen: always merge main first, then fix CI as separate pushes#267
Merged
Conversation
Agent-Logs-Url: https://github.com/githubnext/tsessebe/sessions/0fc6272c-8e4d-4a5b-b011-f932c2eb0c3a Co-authored-by: mrjf <180956+mrjf@users.noreply.github.com>
Copilot
AI
changed the title
[WIP] Update Evergreen process to merge main before fixing CI
Evergreen: always merge main first, then fix CI as separate pushes
May 4, 2026
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.
Evergreen treated
merge_conflictandfailing_checksas independent issues, so a CI-fix run could include a localmainmerge in its patch and conflict with the un-merged remote PR branch onpush_to_pull_request_branch. This change makes "mergemainfirst" an explicit, separate push that always precedes any CI fix.Selector (
pr_needs_attention)get_behind_by()helper hitsGET /repos/{repo}/compare/{base}...{head}and readsbehind_by.behind_main: N commit(s)issue type so PRs behindmainare picked up even when CI is green. Suppressed whenmerge_conflictis already flagged (the merge step covers both).Workflow prompt
Replaces the two ad-hoc subsections with an ordered 5-step flow:
merge_conflictorbehind_main,git fetch origin main+git merge origin/main, resolve, run local checks.push-to-pull-request-branch.Rules
mainas its own push; never bundle amainmerge into a CI-fix patch — that's what causes the patch conflict.successand resets the attempt counter.evergreen.lock.ymlregenerated viagh aw compile.