Skip to content

Commit 80f20fa

Browse files
Mic92Mic92
committed
replace backport github action with mergify
The current backport action cannot automerge because the github action bot does not trigger github CI actions. Mergify instead does not have this limitation and can also use a merge queue. On top we have now a declarative configuration to allow contributers to add new tests to required without having access to the github org. An example pull request and backport can be seen here: Mic92#4 and here: Mic92#5 To complete the setup the mergify app must be enabled for this repository. It's already installed in the nixos organization for nixos-hardware and other repositories.
1 parent b62e5e8 commit 80f20fa

2 files changed

Lines changed: 92 additions & 32 deletions

File tree

‎.github/workflows/backport.yml‎

Lines changed: 0 additions & 32 deletions
This file was deleted.

‎.mergify.yml‎

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
queue_rules:
2+
- name: default
3+
# all required tests need to go here
4+
merge_conditions:
5+
- check-success=installer
6+
- check-success=installer_test (macos-latest)
7+
- check-success=installer_test (ubuntu-latest)
8+
- check-success=tests (macos-latest)
9+
- check-success=tests (ubuntu-latest)
10+
- check-success=vm_tests
11+
merge_method: rebase
12+
batch_size: 5
13+
14+
pull_request_rules:
15+
- name: merge using the merge queue
16+
conditions:
17+
- base=master
18+
- label~=merge-queue|dependencies
19+
actions:
20+
queue: {}
21+
22+
# The rules below will first create backport pull requests and put those in a merge queue.
23+
24+
- name: backport patches to 2.18
25+
conditions:
26+
- label=backport 2.18-maintenance
27+
actions:
28+
backport:
29+
branches:
30+
- 2.18-maintenance
31+
labels:
32+
- merge-queue
33+
34+
- name: backport patches to 2.19
35+
conditions:
36+
- label=backport 2.19-maintenance
37+
actions:
38+
backport:
39+
branches:
40+
- 2.19-maintenance
41+
labels:
42+
- merge-queue
43+
44+
- name: backport patches to 2.20
45+
conditions:
46+
- label=backport 2.20-maintenance
47+
actions:
48+
backport:
49+
branches:
50+
- 2.20-maintenance
51+
labels:
52+
- merge-queue
53+
54+
- name: backport patches to 2.21
55+
conditions:
56+
- label=backport 2.21-maintenance
57+
actions:
58+
backport:
59+
branches:
60+
- 2.21-maintenance
61+
labels:
62+
- merge-queue
63+
64+
- name: backport patches to 2.22
65+
conditions:
66+
- label=backport 2.22-maintenance
67+
actions:
68+
backport:
69+
branches:
70+
- 2.22-maintenance
71+
labels:
72+
- merge-queue
73+
74+
- name: backport patches to 2.23
75+
conditions:
76+
- label=backport 2.23-maintenance
77+
actions:
78+
backport:
79+
branches:
80+
- 2.23-maintenance
81+
labels:
82+
- merge-queue
83+
84+
- name: backport patches to 2.24
85+
conditions:
86+
- label=backport 2.24-maintenance
87+
actions:
88+
backport:
89+
branches:
90+
- "2.24-maintenance"
91+
labels:
92+
- merge-queue

0 commit comments

Comments
 (0)