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.

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

fix(mergify): use queue instead of merge (backport #1923) #1924

Open
wants to merge 2 commits into
base: release-1.44.x
Choose a base branch
from
Open

fix(mergify): use queue instead of merge (backport #1923) #1924

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e4132a9
fix(mergify): use queue instead of merge (#1923)
juanpabloprado Jan 20, 2022
d8f1815
chore(dependencies): use version 8.16.0 of spinnaker-gradle-project
dbyron-sf Jan 21, 2022
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
27 changes: 17 additions & 10 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
queue_rules:
- name: default
conditions:
- status-success=build
- status-success=continuous-integration/travis-ci/pr
- status-failure=build

pull_request_rules:
- name: Automatically merge on CI success and review
conditions:
Expand All @@ -6,9 +13,9 @@ pull_request_rules:
- "label=ready to merge"
- "approved-reviews-by=@oss-approvers"
actions:
merge:
queue:
method: squash
strict: smart
name: default
label:
add: ["auto merged"]
- name: Automatically merge release branch changes on CI success and release manager review
Expand All @@ -18,9 +25,9 @@ pull_request_rules:
- "label=ready to merge"
- "approved-reviews-by=@release-managers"
actions:
merge:
queue:
method: squash
strict: smart
name: default
label:
add: ["auto merged"]
# This rule exists to handle release branches that are still building using Travis CI instead of
Expand All @@ -32,9 +39,9 @@ pull_request_rules:
- "label=ready to merge"
- "approved-reviews-by=@release-managers"
actions:
merge:
queue:
method: squash
strict: smart
name: default
label:
add: ["auto merged"]
- name: Automatically merge PRs from maintainers on CI success and review
Expand All @@ -44,9 +51,9 @@ pull_request_rules:
- "label=ready to merge"
- "author=@oss-approvers"
actions:
merge:
queue:
method: squash
strict: smart
name: default
label:
add: ["auto merged"]
- name: Automatically merge autobump PRs on CI success
Expand All @@ -56,9 +63,9 @@ pull_request_rules:
- "label~=autobump-*"
- "author:spinnakerbot"
actions:
merge:
queue:
method: squash
strict: smart
name: default
label:
add: ["auto merged"]
- name: Request reviews for autobump PRs on CI failure
Expand Down