Skip to content
Merged
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
12 changes: 9 additions & 3 deletions .github/workflows/mirror-oss.yml
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,15 @@ jobs:
if isinstance(node, dict):
for key, child in node.items():
normalized = re.sub(r"[^a-z0-9]", "", key.casefold())
if normalized in {"versionid", "xossversionid"} and isinstance(child, str):
if child and child.casefold() != "null":
yield child
if normalized in {"versionid", "xossversionid"}:
candidates = child if isinstance(child, list) else [child]
for candidate in candidates:
if (
isinstance(candidate, str)
and candidate
and candidate.casefold() != "null"
):
yield candidate
yield from version_ids(child)
elif isinstance(node, list):
for child in node:
Expand Down
1 change: 1 addition & 0 deletions tests/test_workflow_contract.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ def test_oss_workflow_has_no_moving_alias_and_uses_reviewed_shared_bucket() -> N
assert "load_ossutil_json" in workflow
assert workflow.count("JSONDecoder().raw_decode") == 2
assert workflow.count("unexpected output after ossutil JSON document") == 2
assert "candidates = child if isinstance(child, list) else [child]" in workflow


def test_all_external_actions_are_pinned_to_full_commit_sha() -> None:
Expand Down
Loading