Repository navigation
fix(ci): Conda Update goes red when a merge lands between Push Changes' fetch and its push #1649
Description
Follow-up to #1632's fix (#1641). Push Changes fetches main, judges the fetched tip with util/verdict_covers_checkout.py, and rebases onto exactly that sha. If a merge lands on main between that fetch and the push, the push is refused as a non-fast-forward and the step fails, so the Conda Update run goes red. Nothing is written, tagged or uploaded, and the merge's own run makes the next bump. #1641 pins this behaviour (test_a_merge_landing_after_the_fetch_refuses_the_push).
Expected: a lost race ends like the case where main moved before the fetch: pushed=false, a notice, and a green job. The race is rare (a merge within seconds of a bump), but each one is a red run on main that someone has to read down.
Blocked until #1641 merges.
Activity
JarryShaw commentedon Oct 13, 2026
Unblocked: #1641 merged (
2c4683851). A worker is on it.fix(ci): a merge racing Conda Update's push leaves the run green (#1649…