Skip to content

Commit

Permalink
ci(mergify): upgrade configuration to current format
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Jan 16, 2025
1 parent 7486d2e commit 885a2b3
Showing 1 changed file with 65 additions and 21 deletions.
86 changes: 65 additions & 21 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,60 @@
queue_rules:
- name: default
conditions:
- 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 self merge on CI success
queue_conditions:
- base=master
- status-success=build
- "label=ready to merge"
- "label=self merge"
merge_conditions:
- status-success=build
merge_method: squash
- name: duplicated default from Automatically rebase and merge on CI success and
review
queue_conditions:
- base=master
- status-success=build
- "label=ready to rebase"
- "approved-reviews-by=@oss-approvers"
merge_conditions:
- status-success=build
merge_method: rebase
- name: duplicated default from Automatically rebase and self merge on CI success
queue_conditions:
- "label=ready to rebase"
- "label=self merge"
- base=master
- status-success=build
merge_conditions:
- status-success=build
merge_method: rebase
- 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

pull_request_rules:
- name: Automatically merge on CI success and review
Expand All @@ -11,21 +64,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 self merge on CI success
Expand All @@ -35,9 +83,6 @@ pull_request_rules:
- "label=ready to merge"
- "label=self merge"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Automatically rebase and merge on CI success and review
Expand All @@ -47,9 +92,6 @@ pull_request_rules:
- "label=ready to rebase"
- "approved-reviews-by=@oss-approvers"
actions:
queue:
method: rebase
name: default
label:
add: ["auto merged"]
- name: Automatically rebase and self merge on CI success
Expand All @@ -59,9 +101,6 @@ pull_request_rules:
- base=master
- status-success=build
actions:
queue:
method: rebase
name: default
label:
add: ["auto merged"]
- name: Automatically merge autobump PRs on CI success
Expand All @@ -71,9 +110,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 @@ -85,3 +121,11 @@ pull_request_rules:
actions:
request_reviews:
teams: ["oss-approvers"]
- name: 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 + Automatically rebase and merge on CI success and
review + Automatically rebase and self merge on CI success + Automatically self
merge on CI success
conditions: []
actions:
queue:

0 comments on commit 885a2b3

Please sign in to comment.