Skip to content

armgit / cua

Public Imported from GitHub
0

Scale computer-use 2.0 with open-source drivers, cross-OS sandboxes, and benchmarks for training, evaluation, and data generation.

ci: warn instead of holding nightlies on unresolved attribution (#5904)

cua-agents[bot]d536af5e22db
diff --git a/.github/release-attribution-config.json b/.github/release-attribution-config.json
index 3c1bcb1e70..0666c941a8 100644
--- a/.github/release-attribution-config.json
+++ b/.github/release-attribution-config.json
@@ -20,6 +20,7 @@
"hippoley <[email protected]>": "hippoley"
},
"identityOverrides": {
+ "[email protected]": "0xABAN",
"[email protected]": "abonneth",
"[email protected]": "AnvitDevadiga",
"[email protected]": "bitomule",
diff --git a/.github/releases/README.md b/.github/releases/README.md
index 1217f2e2a3..ef15cc2bc3 100644
--- a/.github/releases/README.md
+++ b/.github/releases/README.md
@@ -166,11 +166,13 @@ nightlies are bounded by the previous published nightly. A component therefore
needs a reachable stable tag before its nightly channel is enabled.
Before starting platform builds, the nightly planner scans that exact range for
-unresolved human coauthors. It returns `reason=held-attribution` and creates or
-refreshes one component-specific maintainer issue instead of spending build and
-signing capacity on a candidate that cannot be published. Resolve the identity
-through a linked GitHub email or a verified `identityOverrides` entry; never use
-wildcard or human-email ignores to clear a hold.
+unresolved human coauthors. Unresolved attribution never holds a nightly: the
+build continues, the plan carries `attributionWarning=true`, and the planner
+writes a step summary and creates or refreshes one component-specific
+maintainer issue. Nightly notes omit the unresolved coauthor. Stable releases
+stay strict: `release_attribution.py` fails the manifest until the identity
+resolves through a linked GitHub email or a verified `identityOverrides` entry;
+never use wildcard or human-email ignores to clear it.
## Persistent consumer selection
diff --git a/.github/scripts/release_attribution.py b/.github/scripts/release_attribution.py
index d069f52f47..510923ff6c 100644
--- a/.github/scripts/release_attribution.py
+++ b/.github/scripts/release_attribution.py
@@ -963,6 +963,8 @@ def _change_contributors(
github: GitHubClient,
repository: str,
config: Mapping[str, Any],
+ *,
+ strict_coauthors: bool = True,
) -> tuple[list[dict[str, Any]], list[int], bool]:
bots = {str(item).lower() for item in config.get("bots", [])}
overrides = {
@@ -1000,6 +1002,9 @@ def _change_contributors(
login = merging_maintainer_squash_coauthor(
pull, match.group("name"), github, repository, internal
)
+ if not login and not strict_coauthors:
+ # Nightly notes only: the planner already warned maintainers.
+ continue
if not login:
raise ReleaseError(
f"commit {commit.sha} has unresolved human coauthor {email}; "
@@ -1177,7 +1182,12 @@ def build_manifest(
continue
try:
contributors, issues, pull_visual = _change_contributors(
- pull, commit, github, repository, attribution_config
+ pull,
+ commit,
+ github,
+ repository,
+ attribution_config,
+ strict_coauthors=channel == "stable",
)
except ReleaseError as error:
raise ReleaseError(f"pull request #{pull_number}: {error}") from error
diff --git a/.github/scripts/release_channels.py b/.github/scripts/release_channels.py
index 38507dc86e..c192877b93 100644
--- a/.github/scripts/release_channels.py
+++ b/.github/scripts/release_channels.py
@@ -436,7 +436,7 @@ def nightly_attribution_preflight(
exclude_companion_paths: Sequence[str],
config_path: Path,
) -> list[dict[str, str]]:
- """Find unresolved squash-generated coauthors before an expensive build."""
+ """Find unresolved squash-generated coauthors so maintainers get a warning."""
try:
config = read_json(config_path)
commits = release_attribution.commits_in_range(
@@ -547,9 +547,9 @@ def plan_nightly(
exclude_companion_paths=exclude_companion_paths,
config_path=attribution_config_path,
)
- if attribution_issues:
- should_build = False
- reason = "held-attribution"
+ # Nightlies are not release notes: unresolved attribution is a
+ # warning for maintainers and never stops the build. Stable releases
+ # keep strict enforcement in release_attribution.build_manifest.
return {
"component": name,
"channel": "nightly",
@@ -565,6 +565,7 @@ def plan_nightly(
"shouldBuild": should_build,
"reason": reason,
"attributionIssues": attribution_issues,
+ "attributionWarning": bool(attribution_issues),
}
diff --git a/.github/scripts/tests/test_nightly_release_wiring.py b/.github/scripts/tests/test_nightly_release_wiring.py
index dd55215bca..5c04800760 100644
--- a/.github/scripts/tests/test_nightly_release_wiring.py
+++ b/.github/scripts/tests/test_nightly_release_wiring.py
@@ -126,7 +126,13 @@ def test_planner_requires_main_ancestry_and_preserves_immutable_evidence():
assert "attribution_base_tag" in planner
assert "attribution_issues" in planner
assert "--attribution-config .github/release-attribution-config.json" in planner
- assert "needs.plan.outputs.reason == 'held-attribution'" in planner
+ assert "held-attribution" not in planner
+ assert "report-attribution-warning" in planner
+ assert "needs.plan.outputs.attribution_issues != '[]'" in planner
+ assert "GITHUB_STEP_SUMMARY" in planner
+ assert "gh issue comment" in planner
+ # A failed report must never fail the reusable planner the builds depend on.
+ assert "name: Create or refresh the attribution warning\n continue-on-error: true" in planner
assert "gh issue create" in planner
assert "gh issue edit" in planner
assert "cancel-in-progress: false" in source("nightly-cua-driver.yml")
diff --git a/.github/scripts/tests/test_release_attribution.py b/.github/scripts/tests/test_release_attribution.py
index 4d8b2d820e..bb39fd744d 100644
--- a/.github/scripts/tests/test_release_attribution.py
+++ b/.github/scripts/tests/test_release_attribution.py
@@ -13,6 +13,7 @@ from release_attribution import (
PUBLISHED_INSTALLER_BUMP_RE,
ReleaseError,
_change_contributors,
+ unresolved_coauthor_identities,
build_manifest,
changelog_references_change,
commits_in_range,
@@ -603,6 +604,38 @@ def test_nightly_manifest_attributes_maintenance_prs_without_a_versioned_changel
)
+def test_nightly_skips_unresolved_coauthor_but_stable_stays_strict():
+ commit = CommitRecord(
+ "deadbeef",
+ "fix(driver): preserve focus",
+ "Co-authored-by: Unknown Person <[email protected]>",
+ )
+ pull = {"user": {"login": "author"}, "author_association": "NONE", "body": "", "labels": []}
+ config = {
+ "bots": [],
+ "coauthorOverrides": {},
+ "ignoredCoauthorEmails": [],
+ "identityOverrides": {},
+ "internalHandles": [],
+ "optOutHandles": [],
+ }
+ contributors, _, _ = _change_contributors(
+ pull, commit, FakeGitHub("deadbeef"), "trycua/cua", config, strict_coauthors=False
+ )
+ assert [item["login"] for item in contributors] == ["author"]
+ with pytest.raises(ReleaseError, match="unresolved human coauthor"):
+ _change_contributors(pull, commit, FakeGitHub("deadbeef"), "trycua/cua", config)
+
+
+def test_checked_in_override_resolves_adam():
+ config = json.loads((REPO_ROOT / ".github/release-attribution-config.json").read_text())
+ commits = [
+ CommitRecord("b2", "fix: y", "Co-authored-by: adam <[email protected]>"),
+ ]
+ assert unresolved_coauthor_identities(commits, config) == []
+ assert config["identityOverrides"]["[email protected]"] == "0xABAN"
+
+
def test_unresolved_human_coauthor_fails_closed():
commit = CommitRecord(
"deadbeef",
diff --git a/.github/scripts/tests/test_release_channels.py b/.github/scripts/tests/test_release_channels.py
index dbb77a077f..acd4582857 100644
--- a/.github/scripts/tests/test_release_channels.py
+++ b/.github/scripts/tests/test_release_channels.py
@@ -406,7 +406,7 @@ def test_first_driver_nightly_ignores_perception_only_changes(
_assert_driver_change_detection_excludes_perception(calls[0])
-def test_plan_holds_before_build_for_unresolved_attribution(
+def test_plan_warns_but_still_builds_for_unresolved_attribution(
monkeypatch: pytest.MonkeyPatch, tmp_path: Path
):
previous_sha = "b" * 40
@@ -460,8 +460,9 @@ def test_plan_holds_before_build_for_unresolved_attribution(
root=ROOT,
attribution_config_path=config_path,
)
- assert plan["shouldBuild"] is False
- assert plan["reason"] == "held-attribution"
+ assert plan["shouldBuild"] is True
+ assert plan["reason"] == "relevant-changes"
+ assert plan["attributionWarning"] is True
assert plan["attributionIssues"] == [
{"sha": "deadbeef", "name": "Local Machine", "email": "[email protected]"}
]
diff --git a/.github/workflows/nightly-component-plan.yml b/.github/workflows/nightly-component-plan.yml
index 86ddc380ec..bb92ed74f9 100644
--- a/.github/workflows/nightly-component-plan.yml
+++ b/.github/workflows/nightly-component-plan.yml
@@ -127,12 +127,17 @@ jobs:
if-no-files-found: error
retention-days: 30
- report-attribution-hold:
+ report-attribution-warning:
needs: plan
- if: needs.plan.outputs.reason == 'held-attribution'
+ if: needs.plan.outputs.attribution_issues != '' && needs.plan.outputs.attribution_issues != '[]'
runs-on: ubuntu-latest
+ permissions:
+ issues: write
steps:
- - name: Create or refresh the attribution hold
+ # A warning only: the nightly build continues. Stable releases still
+ # fail closed on unresolved attribution.
+ - name: Create or refresh the attribution warning
+ continue-on-error: true
env:
GH_TOKEN: ${{ github.token }}
COMPONENT: ${{ inputs.component }}
@@ -140,10 +145,10 @@ jobs:
ATTRIBUTION_ISSUES: ${{ needs.plan.outputs.attribution_issues }}
run: |
set -euo pipefail
- TITLE="Nightly ${COMPONENT} held by unresolved contributor attribution"
- BODY="$RUNNER_TEMP/nightly-attribution-hold.md"
+ TITLE="Nightly ${COMPONENT} has unresolved contributor attribution"
+ BODY="$RUNNER_TEMP/nightly-attribution-warning.md"
{
- echo "The nightly planner stopped before the cross-platform build because contributor attribution is unresolved."
+ echo "The nightly build for ${COMPONENT} continued, but some contributors cannot be credited in its notes. A stable release of this range will fail until they are resolved."
echo
echo "Source commit: \`$SOURCE_SHA\`"
echo
@@ -152,12 +157,15 @@ jobs:
echo
echo "Resolve each identity by linking the email to GitHub, amending the source commit with a recognized email before merge, or adding a verified \`identityOverrides\` mapping. Do not add wildcard or human-email ignores."
} > "$BODY"
+ cat "$BODY" >> "$GITHUB_STEP_SUMMARY"
MATCHES=$(gh issue list --repo "${{ github.repository }}" --state open \
--search "\"$TITLE\" in:title" --limit 100 --json number,title)
NUMBER=$(jq -r --arg title "$TITLE" \
'map(select(.title == $title)) | first | .number // empty' <<<"$MATCHES")
if [[ -n "$NUMBER" ]]; then
gh issue edit "$NUMBER" --repo "${{ github.repository }}" --body-file "$BODY"
+ gh issue comment "$NUMBER" --repo "${{ github.repository }}" \
+ --body "Seen again at \`$SOURCE_SHA\`; the nightly build continued."
else
gh issue create --repo "${{ github.repository }}" --title "$TITLE" --body-file "$BODY"
fi