diff --git a/changelog.d/changed-contributor-auto-promotion-hive-scope.md b/changelog.d/changed-contributor-auto-promotion-hive-scope.md new file mode 100644 index 0000000000..f58c730407 --- /dev/null +++ b/changelog.d/changed-contributor-auto-promotion-hive-scope.md @@ -0,0 +1 @@ +- Contributor-lane auto-promotion now counts an author's clean merged PRs across every repository the hive manages (`auto_merge.contributor_lane.auto_promotion_scope: hive`, the default; `repo` restores the per-repository count), so a contributor trusted in the main repo is admitted on their first PR to a satellite repo; the audit marker and admission log carry the scope and a per-repo breakdown (#14517). diff --git a/src/cmd/hive/merge_eligibility.go b/src/cmd/hive/merge_eligibility.go index 019be8c6bc..4add12684f 100644 --- a/src/cmd/hive/merge_eligibility.go +++ b/src/cmd/hive/merge_eligibility.go @@ -89,6 +89,7 @@ func contributorLanePolicyFunc(cfg *config.Config) func() automerge.ContributorL RequireTiers: p.RequireTierSet(), RegistryTiersSufficient: p.EffectiveRegistryTiersSufficient(), AutoPromoteAfterMergedPR: tier.EffectiveAutoPromoteAfterMerged(), + AutoPromotionScope: p.EffectiveAutoPromotionScope(), } } } diff --git a/src/docs/hive-merge.md b/src/docs/hive-merge.md index 458142f70d..1f333daaeb 100644 --- a/src/docs/hive-merge.md +++ b/src/docs/hive-merge.md @@ -432,6 +432,28 @@ A PR merges through this tier only when all of the following hold: with `contributor-lane:no-linked-issue`. The marker's `tier=` must be in `require_tiers` (`contributor-lane:claim-tier-untrusted`) and it must say `verified=true` (`contributor-lane:claim-unverified`). + - **Auto-promotion**: when the marker path fails on tier, the conservative + clean-history ratchet (`auto_merge.contributor_tier.auto_promote_after_merged`, + default 5; negative disables) admits the author if their last N merged + PRs have no revert or sentinel-alert evidence — none is itself a revert, + none carries the sentinel label, none was undone by a later merged + `Revert "
YAML keys: auto_merge.contributor_lane.enabled, auto_merge.contributor_lane.soak_minutes, auto_merge.contributor_lane.require_reviewer_verdict, auto_merge.contributor_lane.registry_tiers_sufficient, auto_merge.contributor_lane.repos[], auto_merge.contributor_lane.exclude_labels[], auto_merge.contributor_lane.require_tiers[].
YAML keys: auto_merge.contributor_lane.enabled, auto_merge.contributor_lane.soak_minutes, auto_merge.contributor_lane.require_reviewer_verdict, auto_merge.contributor_lane.registry_tiers_sufficient, auto_merge.contributor_lane.auto_promotion_scope, auto_merge.contributor_lane.repos[], auto_merge.contributor_lane.exclude_labels[], auto_merge.contributor_lane.require_tiers[].