Skip to content

Ensure verified is required on main branch #4998

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jupierce wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Ensure verified is required on main branch #4998

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions cmd/branchingconfigmanagers/tide-config-manager/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,6 +343,9 @@ func (gae *generalAvailabilityEvent) ensureStaffEngApprovedLabel(q *prowconfig.T

func (gae *generalAvailabilityEvent) overrideExcludedBranches(q *prowconfig.TideQuery) {
branches := sets.New[string](q.ExcludedBranches...)
// Ensure main and master are always excluded so the complement query never applies to them;
// only the dedicated main/master query (with verified) should match PRs targeting those branches.
branches.Insert(mainBranch, masterBranch)
if branches.Has(gae.releasePast) {
branches.Insert(gae.releaseCurrent)
branches.Insert(gae.releaseFuture)
Expand Down