Skip to content

Commit d53301d

Browse files
authored
Teach Mergify to use the Merge Queue (#94)
I've heard this is the antidote to this error: ``` The pull request could not be merged This could be related to an activated branch protection or ruleset rule that prevents us from merging. (detail: Repository rule violations found Changes must be made through the merge queue ``` …is to enable this. Also removed the references to the `maintenance/*` branches which have been left behind in `solana-labs`
1 parent 036d5c7 commit d53301d

File tree

1 file changed

+3
-11
lines changed

1 file changed

+3
-11
lines changed

.mergify.yml

+3-11
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,12 @@ pull_request_rules:
1515
- name: Automatic merge (squash) on CI success
1616
conditions:
1717
- and:
18-
- or:
19-
- and:
20-
- base=maintenance/v1.x
21-
- and:
22-
- status-success~=^Lint, Build, and Test
23-
- status-success="Validate commit message"
24-
- and:
25-
- base!=maintenance/v1.x
26-
- status-success=all-web3-checks
18+
- status-success=all-web3-checks
2719
- label=automerge
2820
- label!=no-automerge
2921
actions:
30-
merge:
31-
method: squash
22+
queue:
23+
name: default
3224
- name: Remove automerge label on CI failure
3325
conditions:
3426
- label=automerge

0 commit comments

Comments
 (0)