Skip to content

fix(ci): ignore clean main synchronization merge authors - #5075

Merged
injaneity merged 5 commits into
mainfrom
onigiri/clean-sync-merge
Oct 20, 2026
Merged

injaneity merged 5 commits into
mainfrom
onigiri/clean-sync-merge

Conversation

@injaneity

Copy link
Copy Markdown
Collaborator

Problem
Maintainer updates from main can require contributor credit on community PRs even when the merge introduces no contribution.

Before/after
Previously, a distinct uncredited sync-merge author blocked attribution validation. Clean two-parent main syncs now bypass author classification while retaining coauthor-trailer checks. API comparisons verify trusted-main ancestry and disjoint changed paths, including rename sources. Missing comparison data, failures, overlapping paths, and file lists of 300 or more retain the existing attribution checks. PR code is never fetched or executed.

Tests

  • New sync cases against origin/main: 10 failed (main lacks the main_sha keyword).
  • Against the preceding commit: 2 failed, 8 passed; missing status/files exposed KeyError failures.
  • At head: python3 -m pytest tests -q: 655 passed, 11 skipped, 126 subtests passed.
  • Existing rename and base-sync assertions remain intact; clean-sync cases also check unresolved coauthor trailers.
  • Production diff against origin/main: +26/-1, net +25 lines. Test diff: +70/-2, net +68 lines.

@f-trycua

Copy link
Copy Markdown
Collaborator

@injaneity
injaneity marked this pull request as ready for review October 20, 2026 05:03
@injaneity
injaneity requested a review from f-trycua as a code owner October 20, 2026 05:03
@injaneity
injaneity merged commit 78d7baf into main Oct 20, 2026
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants