ci(Mergify): configuration update#331
Conversation
Signed-off-by: twisti <null>
twisti-dev
deleted the
mergify/twisti-dev/Ia2488df9f50a42026e1cd3f5d24bef34c580acfd
branch
There was a problem hiding this comment.
Pull request overview
Adds a Mergify configuration to automate PR rebasing and conflict handling in the repository’s CI/automation workflow.
Changes:
- Introduces Mergify pull request rules for auto-rebase based on “commits behind”.
- Adds automatic labeling for conflicting PRs.
- Adds an automated comment to notify authors when a PR is conflicting.
| conditions: | ||
| - "#commits-behind >= 10" | ||
| actions: | ||
| rebase: |
There was a problem hiding this comment.
actions.rebase is declared without a value (rebase:), which parses as null in YAML. Use an explicit empty mapping (or provide required keys) to avoid Mergify config validation/runtime errors.
| rebase: | |
| rebase: {} |
| - name: Make sure PR are update before merging with rebase | ||
| description: This automatically rebases PRs when they are out-of-date with the | ||
| base branch to avoid semantic conflicts (next step us switch to merge | ||
| queue). |
There was a problem hiding this comment.
The rule description says PRs are rebased when they are out-of-date with the base branch, but the condition only triggers when #commits-behind >= 10. Either lower the threshold (e.g., > 0) or update the description so it matches the actual behavior.
| - name: Make sure PR are update before merging with rebase | |
| description: This automatically rebases PRs when they are out-of-date with the | |
| base branch to avoid semantic conflicts (next step us switch to merge | |
| queue). | |
| - name: Rebase PRs when they are 10 or more commits behind | |
| description: This automatically rebases PRs when they are 10 or more | |
| commits behind the base branch to avoid semantic conflicts (next step | |
| us switch to merge queue). |
| @@ -0,0 +1,28 @@ | |||
| pull_request_rules: | |||
| - name: Make sure PR are update before merging with rebase | |||
There was a problem hiding this comment.
Grammar: update the rule name to use correct pluralization/verb form (e.g., "Make sure PRs are updated before merging with rebase").
| - name: Make sure PR are update before merging with rebase | |
| - name: Make sure PRs are updated before merging with rebase |
| pull_request_rules: | ||
| - name: Make sure PR are update before merging with rebase | ||
| description: This automatically rebases PRs when they are out-of-date with the | ||
| base branch to avoid semantic conflicts (next step us switch to merge |
There was a problem hiding this comment.
Typo in description: "next step us switch" should be "next step is to switch".
| base branch to avoid semantic conflicts (next step us switch to merge | |
| base branch to avoid semantic conflicts (next step is to switch to merge |
| toggle: | ||
| - conflict | ||
| - name: Ping PR author when conflicting | ||
| description: Warn the pull request author when their PR are conflicting |
There was a problem hiding this comment.
Grammar: "their PR are conflicting" should be "their PR is conflicting" (or "their PRs are conflicting").
| description: Warn the pull request author when their PR are conflicting | |
| description: Warn the pull request author when their PR is conflicting |
This change has been made by @twisti-dev from the Mergify workflow automation editor.