Skip to content

Commit

Permalink
ci(mergify): disable auto-rebasing due to Mergifyio/mergify#5074
Browse files Browse the repository at this point in the history
  • Loading branch information
DanySK authored Mar 16, 2023
1 parent 4611c89 commit efb1373
Showing 1 changed file with 3 additions and 14 deletions.
17 changes: 3 additions & 14 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
pull_request_rules:
- name: Auto-rebase if appropriately labeled or if author is an authorized bot
conditions:
- or:
- label=auto-update-rebase
- and:
- label=dependencies
- or: &authors_are_bots
- author=renovate[bot]
- author=dependabot[bot]
- -draft
- -conflict
actions:
rebase:
- name: Auto-update with merge if appropriately labeled
conditions:
- label=auto-update-merge
Expand All @@ -21,7 +8,9 @@ pull_request_rules:
update:
- name: rebase-merge working updates
conditions:
- or: *authors_are_bots
- or: &authors_are_bots
- author=renovate[bot]
- author=dependabot[bot]
- label=dependencies
- -draft
- -conflict
Expand Down

0 comments on commit efb1373

Please sign in to comment.