fix(mergify): Mergify config needs adjusting for latest mergify releases #6321
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,61 +1,75 @@ | ||
| queue_rules: | ||
| - name: default | ||
| merge_method: squash | ||
| queue_conditions: | ||
| - check-success=build | ||
|
There was a problem hiding this comment. One bizarre thing: I couldn't find the previous "status-success" field anyplace in mergify docs... There was a problem hiding this comment. Mergifyio/mergify#2039 only place I found which had me wondering if something was "off" for a long time :( |
||
| - check-success=it-test | ||
| merge_conditions: | ||
| - check-success=build | ||
| - check-success=it-test | ||
|
There was a problem hiding this comment. I WILL note - mergify obeys/automatically checks branch protection rules, aka... if we set these in the branch protection rules IN THEORY that should take care of all of this vs. needing to set in the mergify config. These let you adjust and work with branch protection rules, so if we wanted to tweak for additional checks or other stuff we can... I've not seen our branch protection rules to compare though. |
||
|
|
||
| pull_request_rules: | ||
| - name: Make sure PR are up to date before merging | ||
| description: This automatically updates PRs when they are out-of-date with the | ||
| base branch to avoid semantic conflicts (next step is using a merge queue). | ||
| conditions: [] | ||
| actions: | ||
| update: | ||
| - name: Automatically merge backports to releases on succesful build | ||
| conditions: | ||
| - base~=^(release-) | ||
| - head~=^mergify\/bp\/ | ||
| - "author=mergify[bot]" | ||
| actions: | ||
| queue: | ||
| name: default | ||
| label: | ||
| add: ["auto merged"] | ||
| - name: Automatically merge on CI success and review | ||
| conditions: | ||
| - base=master | ||
| - "label=ready to merge" | ||
| - "approved-reviews-by=@oss-approvers" | ||
| - "#approved-reviews-by>=1" | ||
| actions: | ||
| queue: | ||
| name: default | ||
| label: | ||
| add: ["auto merged"] | ||
| - name: Automatically merge release branch changes on CI success and release manager review | ||
| conditions: | ||
| - base~=^release- | ||
| - "label=ready to merge" | ||
| - "approved-reviews-by=@release-managers" | ||
| actions: | ||
| queue: | ||
| name: default | ||
| label: | ||
| add: ["auto merged"] | ||
| - name: Automatically merge PRs from maintainers on CI success and review | ||
| conditions: | ||
| - base=master | ||
| - "label=ready to merge" | ||
| - "author=@oss-approvers" | ||
| - "#approved-reviews-by>=1" | ||
| actions: | ||
| queue: | ||
| name: default | ||
| label: | ||
| add: ["auto merged"] | ||
| - name: Automatically merge autobump PRs on CI success | ||
| conditions: | ||
| - base~=^(master|release-) | ||
| - "label~=autobump-*" | ||
| - "author:spinnakerbot" | ||
| actions: | ||
| queue: | ||
| name: default | ||
| label: | ||
| add: ["auto merged"] | ||
| - name: Request reviews for autobump PRs on CI failure | ||
| conditions: | ||
| - base~=^(master|release-) | ||
| - "label~=autobump-*" | ||
| - base=master | ||
| actions: | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
From https://docs.mergify.com/configuration/file-format/#queue-rules it looks like we don't need to duplicate queue_conditions in merge_conditions. From https://docs.mergify.com/merge-queue/setup/#configuring-the-merge-queue-rules it looks like we only need one. I'd probably stick with queue_conditions and ditch merge_conditions.