Skip to content

Commit 2975c2c

Browse files
authored
Merge pull request #12329 from NixOS/backport
Add mergify backport rule for 2.26
2 parents a28195d + c5dc749 commit 2975c2c

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

.mergify.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -106,3 +106,14 @@ pull_request_rules:
106106
labels:
107107
- automatic backport
108108
- merge-queue
109+
110+
- name: backport patches to 2.26
111+
conditions:
112+
- label=backport 2.26-maintenance
113+
actions:
114+
backport:
115+
branches:
116+
- "2.26-maintenance"
117+
labels:
118+
- automatic backport
119+
- merge-queue

maintainers/release-process.md

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -144,12 +144,10 @@ release:
144144

145145
Make a pull request and auto-merge it.
146146

147-
* Create a milestone for the next release, move all unresolved issues
148-
from the previous milestone, and close the previous milestone. Set
149-
the date for the next milestone 6 weeks from now.
150-
151147
* Create a backport label.
152148

149+
* Add the new backport label to `.mergify.yml`.
150+
153151
* Post an [announcement on Discourse](https://discourse.nixos.org/c/announcements/8), including the contents of
154152
`rl-$VERSION.md`.
155153

0 commit comments

Comments
 (0)