From 3ed55c5232206bc501961d7f27fcb7430eed8e73 Mon Sep 17 00:00:00 2001 From: Lawrence Chen <54008264+lawrencecchen@users.noreply.github.com> Date: Wed, 30 Sep 2026 12:15:38 -0700 Subject: [PATCH 1/2] ci: drop the unreachable second shallow check in the submodule guard #15884 and #15924 each added a shallow-clone check to local_relation. The first returns for every shallow clone, so the second, inside the diverged branch, never runs. Co-Authored-By: Claude Opus 5.5 (1M context) --- scripts/ci/submodule_forward_only.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/scripts/ci/submodule_forward_only.py b/scripts/ci/submodule_forward_only.py index 71df4103f8b3..fae0a4682c39 100755 --- a/scripts/ci/submodule_forward_only.py +++ b/scripts/ci/submodule_forward_only.py @@ -64,11 +64,6 @@ def local_relation(path: str, base: str, new: str) -> str | None: base_exists = run("git", "-C", path, "cat-file", "-e", f"{base}^{{commit}}") new_exists = run("git", "-C", path, "cat-file", "-e", f"{new}^{{commit}}") if base_exists.returncode == 0 and new_exists.returncode == 0: - # A shallow clone cuts the history between the two commits, so a - # failed ancestry check there proves nothing; let GitHub decide. - shallow = run("git", "-C", path, "rev-parse", "--is-shallow-repository") - if shallow.stdout.strip() == "true": - return None return "diverged" return None From 108bd102d21d9c5f183457f20360cf493b5b7b4a Mon Sep 17 00:00:00 2001 From: Lawrence Chen <54008264+lawrencecchen@users.noreply.github.com> Date: Wed, 30 Sep 2026 12:24:09 -0700 Subject: [PATCH 2/2] test: expect the cancelled-run message from the tests gate #16150 made a cancelled linux-preflight report that the run has no verdict instead of 'linux preflight did not pass: cancelled'. The gate still fails, but the assertion kept the old text, so CI fast guards failed on main. Co-Authored-By: Claude Opus 5.5 (1M context) --- tests/test_ci_change_areas.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/test_ci_change_areas.py b/tests/test_ci_change_areas.py index 118e3f0a4e8d..3105203297e1 100755 --- a/tests/test_ci_change_areas.py +++ b/tests/test_ci_change_areas.py @@ -3876,7 +3876,11 @@ def test_linux_failure_still_blocks_tests_after_macos_succeeds() -> None: needs["linux-preflight"]["result"] = outcome result = run_tests_gate(needs) assert result.returncode != 0, outcome - assert f"linux preflight did not pass: {outcome}" in result.stderr + if outcome == "cancelled": + # A stopped run reports that it has no verdict (#16150). + assert "cancelled: linux-preflight" in result.stderr + else: + assert f"linux preflight did not pass: {outcome}" in result.stderr def test_macos_status_accepts_compile_only_prior_admission_skip() -> None: