Skip to content

chore(mergify): Trigger automatic update rule for approved PRs #824

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

Open
LalatenduMohanty wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(mergify): Trigger automatic update rule for approved PRs #824

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions .mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
pull_request_rules:
- name: Automatic rebase to keep PRs up-to-date
conditions:
- "-draft"
- "-conflict"
- "-closed"
- "#approved-reviews-by>=1"
Copy link
Member

@dhellmann dhellmann Oct 29, 2025

Choose a reason for hiding this comment

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

I think this rule is going to conflict with the one we have that causes MRs to merge when they are approved.

Copy link
Member Author

@LalatenduMohanty LalatenduMohanty Oct 29, 2025

Choose a reason for hiding this comment

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

@dhellmann Along with this change we need to do the following
If you want to force a specific update method, you need to configure it in your GitHub repository settings:
Go to: Repository Settings → General → Pull Requests
Look for: "Allow merge commits" / "Allow squash merging" / "Allow rebase merging"
Set your preferred default

Copy link
Member

@dhellmann dhellmann Nov 1, 2025

Choose a reason for hiding this comment

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

Ok, but I don't think we want to rebase on merge. We want to force the tests to run against the code either merged against main or rebased against main.

actions:
update:
- name: Add CI label
conditions:
- or:
Expand Down
Loading