Skip to content

Commit

Permalink
fix: fix mergify config
Browse files Browse the repository at this point in the history
  • Loading branch information
arirubinstein committed Aug 16, 2022
1 parent 0399f60 commit ea9fde7
Showing 1 changed file with 10 additions and 15 deletions.
25 changes: 10 additions & 15 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,36 +1,31 @@
pull_request_rules:
- name: merge to master
queue_rules:
- name: main
conditions:
- label=automerge:merge
- base=main
# Require integration tests before merging only
- check-success=Cloudflare Pages
- check-success=Lint and Test Snippets
- check-success=Test the build
- "#approved-reviews-by>=1"
- "#review-threads-unresolved=0"
pull_request_rules:
- name: merge to master
conditions:
- label=automerge:merge
actions:
queue:
name: main
method: merge
- name: rebase updates then merge to master
conditions:
- label=automerge:rebase
- check-success=Cloudflare Pages
- check-success=Lint and Test Snippets
- check-success=Test the build
- "#approved-reviews-by>=1"
- "#review-threads-unresolved=0"
actions:
queue:
name: main
method: merge
update_method: rebase
- name: squash to master
conditions:
- label=automerge:squash
- check-success=Cloudflare Pages
- check-success=Lint and Test Snippets
- check-success=Test the build
- "#approved-reviews-by>=1"
- "#review-threads-unresolved=0"
actions:
queue:
name: main
method: squash

0 comments on commit ea9fde7

Please sign in to comment.