Skip to content

Commit b00a8de

Browse files
authored
Stop using mergify merge queue feature (Qiskit#9807)
Due to recent changes in the mergify configuration/service the merge queue feature of mergify is no longer working as expected. It's not clear if this just a temporary bug in mergify, a longer term change in behavior (which requires all PR authors to be registered on mergify), or some incompatibility between the github api and mergify. However, because we're no longer able to rely on it we've moved to using github's native merge queue feature [1][2] instead. Since this new merge queue would conflict with mergify's this commit removes the merge queue configuration from the mergify configuration. The configuration for stable backporting is left in place because github doesn't natively offer that feature and it appears to still work fine. [1] https://github.blog/changelog/2023-02-08-pull-request-merge-queue-public-beta/ [2] https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
1 parent 07ca200 commit b00a8de

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

.mergify.yml

+1-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,5 @@
1-
queue_rules:
2-
- name: automerge
3-
conditions:
4-
- check-success=Qiskit.qiskit-terra
5-
1+
---
62
pull_request_rules:
7-
- name: automatic merge on CI success and review
8-
conditions:
9-
- check-success=Qiskit.qiskit-terra
10-
- "#approved-reviews-by>=1"
11-
- label=automerge
12-
- label!=on hold
13-
actions:
14-
queue:
15-
name: automerge
16-
method: squash
173
- name: backport
184
conditions:
195
- label=stable backport potential

0 commit comments

Comments
 (0)