Skip to content

Commit

Permalink
ci: added a new high priority queue to mergify (#9802)
Browse files Browse the repository at this point in the history
refs: #8396

## Description

This PR adds a new high-priority queue to mergify. A high priority queue allows us to merge urgent PRs before low priority ones, essentially speeding up patch/hotfix release.
This does not bypass any CI checks for merging so all the normal standard is still followed even for high priority queues

Resources: https://docs.mergify.com/merge-queue/multi/

The way to use this new high priority queue is to add a new label `priority:high` github and add that on high priority PRs. 

### Fallback:
In case the new queue does not work as expected, the original queue is sill present and working

### Security Considerations


### Scaling Considerations


### Documentation Considerations


### Testing Considerations


### Upgrade Considerations
  • Loading branch information
mergify[bot] authored Aug 4, 2024
2 parents 5cd99ea + 67624e3 commit 369fa7c
Showing 1 changed file with 25 additions and 3 deletions.
28 changes: 25 additions & 3 deletions .mergify.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,30 @@
# Linear queue for the main branch.
queue_rules:
- name: high_priority_main
commit_message_template: |-
{{ title }} (#{{ number }})
{{ body | trim }}
queue_conditions:
- base=master
- label=priority:high
- or:
- check-pending=integration-test-result
- check-success=integration-test-result
- label=bypass:integration
- or:
- and: # breakage succeeds like we thought
- check-success=breakage
- -label=proto:expect-breakage
- and: # breakage fails like we thought
- check-failure=breakage
- label=proto:expect-breakage
merge_conditions:
- base=master
# Require integration tests before merging only
- or:
- label=bypass:integration
- check-success=integration-test-result
- name: main
commit_message_template: |-
{{ title }} (#{{ number }})
Expand Down Expand Up @@ -35,15 +60,13 @@ pull_request_rules:
- label=bypass:linear-history
actions:
queue:
name: main
merge_method: merge
- name: rebase updates then merge to master
conditions:
- base=master
- label=automerge:rebase
actions:
queue:
name: main
merge_method: merge
update_method: rebase
- name: squash to master
Expand All @@ -52,5 +75,4 @@ pull_request_rules:
- label=automerge:squash
actions:
queue:
name: main
merge_method: squash

0 comments on commit 369fa7c

Please sign in to comment.