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): stage regenerated bundles completely and keep the train going past a broken branch

rubenluetke10-beep2b21c12c7272
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index f26ba26dc8..fd26ee3dc0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -68,6 +68,9 @@ env:
PIP_DISABLE_PIP_VERSION_CHECK: "1"
jobs:
+ # Matrix jobs carry no explicit `name:`: a skipped matrix job renders an
+ # interpolated name raw ("tests macos ${{ matrix.shard }}") in the check
+ # list. The job id plus the matrix value reads cleanly in both states.
detect:
name: detect lanes
runs-on: ubuntu-latest
@@ -240,7 +243,6 @@ jobs:
run: python -m mypy jarvis/
tests-linux:
- name: tests linux ${{ matrix.shard }}/6
needs: detect
if: needs.detect.outputs.python == 'true'
strategy:
@@ -287,7 +289,6 @@ jobs:
retention-days: 14
tests-windows:
- name: tests windows ${{ matrix.shard }}
needs: detect
if: needs.detect.outputs.python == 'true'
strategy:
@@ -357,7 +358,6 @@ jobs:
retention-days: 14
tests-macos:
- name: tests macos ${{ matrix.shard }}/3
needs: detect
if: needs.detect.outputs.macos == 'true' && needs.detect.outputs.python == 'true'
strategy:
@@ -457,7 +457,6 @@ jobs:
run: python3 scripts/ci/check_frontend_bundle_budget.py
jarvisctl:
- name: jarvisctl light install (${{ matrix.os }})
needs: detect
if: needs.detect.outputs.cli == 'true'
strategy:
@@ -511,7 +510,6 @@ jobs:
run: python scripts/ci/check_portable_install_matrix.py --jobs 4
realtime-contract:
- name: realtime contract (${{ matrix.os }})
needs: detect
if: needs.detect.outputs.realtime == 'true'
strategy:
@@ -580,7 +578,6 @@ jobs:
- run: python scripts/realtime_reliability_gate.py --contract-soak
dragdrop:
- name: dragdrop (${{ matrix.os }})
needs: detect
if: needs.detect.outputs.dragdrop == 'true'
strategy:
diff --git a/scripts/ci/agent_integrate.py b/scripts/ci/agent_integrate.py
index 630603b0e9..2068c800da 100644
--- a/scripts/ci/agent_integrate.py
+++ b/scripts/ci/agent_integrate.py
@@ -356,11 +356,25 @@ def update(onto: str, mode: str, resolver_cmd: str, cwd: Path = REPO_ROOT) -> di
git("rebase", "--skip", check=False, cwd=cwd)
if regen:
failed = regenerate(regen, cwd)
- paths = [p for p, _ in GENERATED] + ["jarvis/ui/web/dist"]
- git("add", "-A", "--", *[p.rstrip("*") for p in paths], check=False, cwd=cwd)
+ # One missing pathspec makes `git add` stage NOTHING, so pass only the
+ # generated paths that exist — a half-staged frontend bundle is the
+ # exact breakage the dist-consistency gate exists for.
+ specs = {p.rstrip("*").rstrip("/") for p, _ in GENERATED}
+ existing = sorted(s for s in specs if (cwd / s).exists())
+ if existing:
+ git("add", "-A", "--", *existing, cwd=cwd)
staged = git("diff", "--cached", "--name-only", cwd=cwd).stdout.strip()
if staged:
- git("commit", "-m", "chore: regenerate generated files after update", cwd=cwd)
+ commit = git(
+ "commit",
+ "-m",
+ "chore: regenerate generated files after update",
+ check=False,
+ cwd=cwd,
+ )
+ if commit.returncode != 0:
+ print(commit.stdout[-3000:] + commit.stderr[-3000:], flush=True)
+ return {"status": "conflict", "unresolved": ["<regenerated files rejected>"]}
report["regenerated"] = sorted(regen - set(failed))
if failed:
report["regen_failed"] = failed
@@ -448,7 +462,18 @@ def train(repo: str, max_updates: int, resolver_cmd: str, dry_run: bool, token_i
summary.append(f"#{number}: behind main, waits for a free update slot")
continue
updates += 1
- summary.append(f"#{number}: " + update_pr(pr, resolver_cmd, dry_run, token_is_bot))
+ try:
+ outcome = update_pr(pr, resolver_cmd, dry_run, token_is_bot)
+ except (subprocess.CalledProcessError, OSError) as exc:
+ # One broken branch must never stop the train for the others.
+ print(f"[train] #{number}: update crashed: {exc}", flush=True)
+ outcome = f"update crashed ({type(exc).__name__}); left for the next tick"
+ finally:
+ git("merge", "--abort", check=False)
+ git("rebase", "--abort", check=False)
+ git("reset", "-q", "--hard", check=False)
+ git("clean", "-fdq", "--", "jarvis/ui/web/dist", check=False)
+ summary.append(f"#{number}: {outcome}")
continue
state = gate_state(repo, sha)
if state == "success" and not merged: