Skip to content

Commit

Permalink
Update mergify.yml
Browse files Browse the repository at this point in the history
Signed-off-by: J. K. Edwards <joed6834@colorado.edu>
  • Loading branch information
bearycool11 authored Jan 12, 2025
1 parent 8edcdf9 commit 512a13d
Showing 1 changed file with 57 additions and 0 deletions.
57 changes: 57 additions & 0 deletions .workflow/mergify.yml
Original file line number Diff line number Diff line change
@@ -52,6 +52,62 @@ queue_rules:
- check-success=handle_pull_request
- check-success=handle_review
<<<<<<< bearycool11-patch-11
pull_request_rules:
- name: Automatic merge on approval
conditions:
- base=main
- "#approved-reviews-by>=1"
- check-success=get_current_step
- check-success=handle_pull_request
- check-success=handle_review
actions:
merge:
method: squash
strict: true
commit_message: title+body

- name: Delete head branch after merge
conditions:
- merged
actions:
delete_head_branch: {}

queue_rules:
- name: default
conditions:
- check-success=get_current_step
- check-success=handle_pull_request
- check-success=handle_review

pull_request_rules:
- name: Automatic merge on approval
conditions:
- base=main
- "#approved-reviews-by>=1"
- check-success=get_current_step
- check-success=handle_pull_request
- check-success=handle_review
actions:
merge:
method: squash
strict: true
commit_message: title+body

- name: Delete head branch after merge
conditions:
- merged
actions:
delete_head_branch: {}

queue_rules:
- name: default
conditions:
- check-success=get_current_step
- check-success=handle_pull_request
- check-success=handle_review
=======
>>>>>>> main
<<<<<<< bearycool11-patch-11
=======

pull_request_rules:
@@ -165,3 +221,4 @@ queue_rules:
- check-success=handle_pull_request
- check-success=handle_review
>>>>>>> main

0 comments on commit 512a13d

Please sign in to comment.