Skip to content
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.

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

ci(mergify): upgrade configuration to current format #76

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
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
41 changes: 33 additions & 8 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,36 @@
---
defaults:
actions:
queue:
name: default
method: rebase
update_method: rebase

queue_rules:
- name: duplicated default from merge after one approval (no design changes)
queue_conditions:
- base~=^(main)|(release-.+)$
- label!=design
- "#approved-reviews-by>=1"
- "#changes-requested-reviews-by=0"
- check-success=test-lint
- check-success=test-protoc
merge_conditions:
- check-success=test-lint
- check-success=test-protoc
merge_method: rebase
update_method: rebase
- name: duplicated default from design changes needs approval from at least one
core maintainer
queue_conditions:
- base~=^(main)|(release-.+)$
- label=design
- "#approved-reviews-by>=2"
- "#changes-requested-reviews-by=0"
- "approved-reviews-by=@csi-addons/maintainers"
- check-success=test-lint
- check-success=test-protoc
merge_conditions:
- check-success=test-lint
- check-success=test-protoc
merge_method: rebase
update_method: rebase
- name: default
conditions:
- check-success=test-lint
Expand All @@ -30,10 +54,8 @@ pull_request_rules:
- check-success=test-lint
- check-success=test-protoc
actions:
queue: {}
dismiss_reviews: {}
delete_head_branch: {}

- name: design changes needs approval from at least one core maintainer
conditions:
- base~=^(main)|(release-.+)$
Expand All @@ -44,10 +66,8 @@ pull_request_rules:
- check-success=test-lint
- check-success=test-protoc
actions:
queue: {}
dismiss_reviews: {}
delete_head_branch: {}

- name: label design changes (update the generated Go files)
conditions:
- files~=^(lib/go/)
Expand All @@ -65,3 +85,8 @@ pull_request_rules:
request_reviews:
users_from_teams:
- "@csi-addons/maintainers"
- name: design changes needs approval from at least one core maintainer + merge
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I still don't understand this rule

after one approval (no design changes)
conditions: []
actions:
queue: