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 #2114

Open
wants to merge 1 commit into
base: master
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
60 changes: 47 additions & 13 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,42 @@
queue_rules:
- name: duplicated default from Automatically merge on CI success and review
queue_conditions:
- base=master
- status-success=build
- "label=ready to merge"
- "approved-reviews-by=@oss-approvers"
merge_conditions:
- status-success=build
merge_method: squash
- name: duplicated default from Automatically merge release branch changes on CI
success and release manager review
queue_conditions:
- base~=^release-
- status-success=build
- "label=ready to merge"
- "approved-reviews-by=@release-managers"
merge_conditions:
- status-success=build
merge_method: squash
- name: duplicated default from Automatically merge PRs from maintainers on CI success
and review
queue_conditions:
- base=master
- status-success=build
- "label=ready to merge"
- "author=@oss-approvers"
merge_conditions:
- status-success=build
merge_method: squash
- name: duplicated default from Automatically merge autobump PRs on CI success
queue_conditions:
- base~=^(master|release-)
- status-success=build
- "label~=autobump-*"
- "author:spinnakerbot"
merge_conditions:
- status-success=build
merge_method: squash
- name: default
conditions:
- status-success=build
Expand All @@ -11,21 +49,16 @@ pull_request_rules:
- "label=ready to merge"
- "approved-reviews-by=@oss-approvers"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Automatically merge release branch changes on CI success and release manager review
- name: Automatically merge release branch changes on CI success and release manager
review
conditions:
- base~=^release-
- status-success=build
- "label=ready to merge"
- "approved-reviews-by=@release-managers"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Automatically merge PRs from maintainers on CI success and review
Expand All @@ -35,9 +68,6 @@ pull_request_rules:
- "label=ready to merge"
- "author=@oss-approvers"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Automatically merge autobump PRs on CI success
Expand All @@ -47,9 +77,6 @@ pull_request_rules:
- "label~=autobump-*"
- "author:spinnakerbot"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Request reviews for autobump PRs on CI failure
Expand All @@ -61,3 +88,10 @@ pull_request_rules:
actions:
request_reviews:
teams: ["oss-approvers"]
- name: Automatically merge PRs from maintainers on CI success and review + Automatically
merge autobump PRs on CI success + Automatically merge on CI success and review
+ Automatically merge release branch changes on CI success and release manager
review
conditions: []
actions:
queue: