Skip to content

Commit

Permalink
Remove merge queue from mergify bot
Browse files Browse the repository at this point in the history
  • Loading branch information
TimPansino committed Dec 13, 2024
1 parent bdade73 commit 113a51a
Showing 1 changed file with 1 addition and 27 deletions.
28 changes: 1 addition & 27 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,9 @@
# For condition grammar see: https://docs.mergify.com/conditions/#grammar

shared:
conditions:
- and: &pr_ready_checks
- "#approved-reviews-by>=1" # A '#' pulls the length of the underlying list
- "label=ready-to-merge"
- "check-success=tests"
- "-draft" # Don't include draft PRs
- "-merged"
- or: # Only handle branches that target main or develop branches
- "base=main"
- "base~=^develop"

queue_rules:
- name: default
queue_conditions:
- and: *pr_ready_checks
- "-head~=^develop"
merge_conditions:
- and: *pr_ready_checks
merge_method: squash

pull_request_rules:
# Merge Queue PR Rules
# Automatic PR Updates
- name: Automatic PR branch updates
conditions:
- "queue-position=-1" # Not queued
- "-draft" # Don't include draft PRs
- "-merged"
actions:
Expand Down Expand Up @@ -70,7 +48,3 @@ pull_request_rules:
label:
remove:
- "tests-failing"
- name: Regular PRs - Add to merge queue on approval (squash)
conditions: []
actions:
queue:

0 comments on commit 113a51a

Please sign in to comment.