Skip to content

Commit

Permalink
Merge pull request #15 from bpfman/mergify/astoycos/config-update
Browse files Browse the repository at this point in the history
ci(Mergify): configuration update
  • Loading branch information
astoycos authored Jun 3, 2024
2 parents 8abeb40 + aa859c9 commit 2b6a6f2
Showing 1 changed file with 41 additions and 0 deletions.
41 changes: 41 additions & 0 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
pull_request_rules:
- name: automatic merge for Dependabot pull requests
conditions:
- author=dependabot[bot]
- check-success=build-workflow-complete
- label!=hold
actions:
merge:
method: merge

- name: automatic merge conditions for main
conditions:
- "#approved-reviews-by>=1"
- "#review-requested=0"
- "#changes-requested-reviews-by=0"
- base=main
- label!=hold
- label!=work-in-progress
- check-success=DCO
- check-success=build-workflow-complete
actions:
merge:
method: merge

- name: Warn on conflicts
conditions:
- conflict
actions:
comment:
message: "@{{author}}, this pull request is now in conflict and requires a rebase."
label:
add:
- needs-rebase

- name: remove conflict label if not needed
conditions:
- -conflict
actions:
label:
remove:
- needs-rebase

0 comments on commit 2b6a6f2

Please sign in to comment.