Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions scripts/ci/submodule_forward_only.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
6 changes: 5 additions & 1 deletion tests/test_ci_change_areas.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Loading