Skip to content

Dodaios is an open-source agent OS for your desktop: it runs your coding agents, browser and apps by voice or chat, on your own machine. Formerly Personal Jarvis.

fix(ci): approve parked CI runs even while GitHub recomputes mergeability

rubenluetke10-beepe90d2e19376d
diff --git a/scripts/ci/agent_integrate.py b/scripts/ci/agent_integrate.py
index bc26184beb..363bc3d4f0 100644
--- a/scripts/ci/agent_integrate.py
+++ b/scripts/ci/agent_integrate.py
@@ -466,12 +466,12 @@ def decide(mergeable: str, state: str, behind: bool) -> str:
"""
if mergeable == "CONFLICTING":
return "update"
+ if state in ("approve", "rerun"):
+ return state # getting CI to run never depends on mergeability
if mergeable not in ("MERGEABLE", ""):
return "wait" # GitHub is still computing mergeability
if state == "success":
return "merge"
- if state in ("approve", "rerun"):
- return state
if state == "failure" and behind:
return "update"
return "wait"
diff --git a/tests/unit/ci/test_pipeline_scripts.py b/tests/unit/ci/test_pipeline_scripts.py
index c889f494d9..fcad7c9db6 100644
--- a/tests/unit/ci/test_pipeline_scripts.py
+++ b/tests/unit/ci/test_pipeline_scripts.py
@@ -334,6 +334,7 @@ def test_train_updates_only_conflicting_or_stale_red_branches():
assert decide("MERGEABLE", "failure", True) == "update"
assert decide("MERGEABLE", "failure", False) == "wait"
assert decide("UNKNOWN", "success", False) == "wait"
+ assert decide("UNKNOWN", "approve", False) == "approve"
# --------------------------------------------------------------------------- release