Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: added priority rules for high priority #25

Merged
merged 1 commit into from
Oct 17, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
Loading