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

Add another warning from mergify[bot] #888

Merged
merged 1 commit into from
Dec 8, 2023
Merged

Add another warning from mergify[bot] #888

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
25 changes: 23 additions & 2 deletions .github/mergify.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ pull_request_rules:
branches:
- humble


- name: Backport to iron at reviewers discretion
conditions:
- base=master
Expand All @@ -21,7 +20,29 @@ pull_request_rules:
- name: Ask to resolve conflict
conditions:
- conflict
- author!=mergify
- author!=mergify[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @{{author}}?

- name: Ask to resolve conflict for backports
conditions:
- conflict
- author=mergify[bot]
actions:
comment:
message: This pull request is in conflict. Could you fix it @bmagyar @dstogl @christophfroehlich?

- name: development targets master branch
conditions:
- base!=master
- author!=bmagyar
- author!=dstogl
- author!=christophfroehlich
- author!=mergify[bot]
actions:
comment:
message: |
@{{author}}, all pull requests must be targeted towards the `master` development branch.
Once merged into `master`, it is possible to backport to @{{base}}, but it must be in `master`
to have these changes reflected into new distributions.
Loading