mirror of
https://github.com/NixOS/nix.git
synced 2025-11-09 20:16:03 +01:00
commit
9bee0fa6ac
3 changed files with 15 additions and 5 deletions
11
.mergify.yml
11
.mergify.yml
|
|
@ -161,3 +161,14 @@ pull_request_rules:
|
||||||
labels:
|
labels:
|
||||||
- automatic backport
|
- automatic backport
|
||||||
- merge-queue
|
- merge-queue
|
||||||
|
|
||||||
|
- name: backport patches to 2.31
|
||||||
|
conditions:
|
||||||
|
- label=backport 2.31-maintenance
|
||||||
|
actions:
|
||||||
|
backport:
|
||||||
|
branches:
|
||||||
|
- "2.31-maintenance"
|
||||||
|
labels:
|
||||||
|
- automatic backport
|
||||||
|
- merge-queue
|
||||||
|
|
|
||||||
2
.version
2
.version
|
|
@ -1 +1 @@
|
||||||
2.31.0
|
2.32.0
|
||||||
|
|
|
||||||
|
|
@ -133,6 +133,8 @@ release:
|
||||||
|
|
||||||
Commit and push this to the maintenance branch.
|
Commit and push this to the maintenance branch.
|
||||||
|
|
||||||
|
* Create a backport label.
|
||||||
|
|
||||||
* Bump the version of `master`:
|
* Bump the version of `master`:
|
||||||
|
|
||||||
```console
|
```console
|
||||||
|
|
@ -140,6 +142,7 @@ release:
|
||||||
$ git pull
|
$ git pull
|
||||||
$ NEW_VERSION=2.13.0
|
$ NEW_VERSION=2.13.0
|
||||||
$ echo $NEW_VERSION > .version
|
$ echo $NEW_VERSION > .version
|
||||||
|
$ ... edit .mergify.yml to add the previous version ...
|
||||||
$ git checkout -b bump-$NEW_VERSION
|
$ git checkout -b bump-$NEW_VERSION
|
||||||
$ git commit -a -m 'Bump version'
|
$ git commit -a -m 'Bump version'
|
||||||
$ git push --set-upstream origin bump-$NEW_VERSION
|
$ git push --set-upstream origin bump-$NEW_VERSION
|
||||||
|
|
@ -147,10 +150,6 @@ release:
|
||||||
|
|
||||||
Make a pull request and auto-merge it.
|
Make a pull request and auto-merge it.
|
||||||
|
|
||||||
* Create a backport label.
|
|
||||||
|
|
||||||
* Add the new backport label to `.mergify.yml`.
|
|
||||||
|
|
||||||
* Post an [announcement on Discourse](https://discourse.nixos.org/c/announcements/8), including the contents of
|
* Post an [announcement on Discourse](https://discourse.nixos.org/c/announcements/8), including the contents of
|
||||||
`rl-$VERSION.md`.
|
`rl-$VERSION.md`.
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue