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): Mergify config needs adjusting for latest mergify releases #6321

Merged
merged 5 commits into from
Jan 3, 2025
Merged

fix(mergify): Mergify config needs adjusting for latest mergify releases #6321

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3551f79
fix(mergify): Mergify config needs adjusting for latest mergify releases
jasonmcintosh Dec 18, 2024
02f8f78
fix(mergify): Add integration test checks
jasonmcintosh Dec 18, 2024
68777f7
fix(mergify): Add integration test checks
jasonmcintosh Dec 18, 2024
f663657
fix(mergify): Add integration test checks
jasonmcintosh Dec 18, 2024
1c8018c
fix(mergify): Use just queue_conditions
jasonmcintosh Jan 3, 2025
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
33 changes: 22 additions & 11 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,72 @@
queue_rules:
- name: default
conditions:
- status-success=build
merge_method: squash
queue_conditions:
Copy link
Contributor

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.

Copy link
Member Author

Choose a reason for hiding this comment

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

Frankly not sure even need that since branch protection rules SHOULD cover these. IF we have branch rules set ;)

- check-success=build
jasonmcintosh marked this conversation as resolved.
Show resolved Hide resolved
- check-success=it-test

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
- status-success=build
- "label=ready to merge"
- "approved-reviews-by=@oss-approvers"
- "#approved-reviews-by>=1"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- 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
conditions:
- base=master
- status-success=build
- "label=ready to merge"
- "author=@oss-approvers"
- "#approved-reviews-by>=1"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Automatically merge autobump PRs on CI success
conditions:
- base~=^(master|release-)
- status-success=build
- "label~=autobump-*"
- "author:spinnakerbot"
actions:
queue:
method: squash
name: default
label:
add: ["auto merged"]
- name: Request reviews for autobump PRs on CI failure
conditions:
- base~=^(master|release-)
- status-failure=build
- "label~=autobump-*"
- base=master
actions:
Expand Down
Loading