Skip to content

Commit

Permalink
ci: added priority rules for high priority (#25)
Browse files Browse the repository at this point in the history
replaces special high priority queues with high priority rules
  • Loading branch information
mergify[bot] authored Oct 17, 2024
2 parents 609e6ee + 9b92867 commit f7ca954
Showing 1 changed file with 6 additions and 53 deletions.
59 changes: 6 additions & 53 deletions .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ shared:
- check-pending=integration-test-result
- check-success=integration-test-result
- label=bypass:integration
high_priority_queue_conditions: &high-priority-queue-conditions
- and: *queue-conditions
- label=priority:high
merge_conditions: &merge-conditions
- base=main
# Rebase PRs with fixup commits are allowed to enter the merge queue but
Expand Down Expand Up @@ -41,31 +38,13 @@ shared:
- base=main
- label=automerge:squash

queue_rules:
- name: high_priority_rebase
commit_message_template: *commit-message-template
queue_conditions: *high-priority-queue-conditions
merge_conditions: *merge-conditions
merge_method: merge
update_method: rebase

- name: high_priority_merge
commit_message_template: *commit-message-template
queue_conditions: *high-priority-queue-conditions
merge_conditions: *merge-conditions
disallow_checks_interruption_from_queues:
- high_priority_rebase
merge_method: merge

- name: high_priority_squash
commit_message_template: *commit-message-template
queue_conditions: *high-priority-queue-conditions
merge_conditions: *merge-conditions
disallow_checks_interruption_from_queues:
- high_priority_rebase
- high_priority_merge
merge_method: squash
priority_rules:
- name: high_priority
conditions:
- label=priority:high
priority: high

queue_rules:
- name: rebase
commit_message_template: *commit-message-template
queue_conditions: *queue-conditions
Expand All @@ -77,41 +56,15 @@ queue_rules:
commit_message_template: *commit-message-template
queue_conditions: *queue-conditions
merge_conditions: *merge-conditions
disallow_checks_interruption_from_queues:
- rebase
merge_method: merge

- name: squash
commit_message_template: *commit-message-template
queue_conditions: *queue-conditions
merge_conditions: *merge-conditions
disallow_checks_interruption_from_queues:
- rebase
- merge
merge_method: squash

pull_request_rules:
- name: high priority - merge to main
conditions:
- and: *pr-queue-merge-conditions
- label=priority:high
actions:
queue:
name: high_priority_merge
- name: high priority - rebase updates then merge to main
conditions:
- and: *pr-queue-rebase-conditions
- label=priority:high
actions:
queue:
name: high_priority_rebase
- name: high priority - squash to main
conditions:
- and: *pr-queue-squash-conditions
- label=priority:high
actions:
queue:
name: high_priority_squash
- name: merge to main
conditions: *pr-queue-merge-conditions
actions:
Expand Down

0 comments on commit f7ca954

Please sign in to comment.