Apply suggestions from code review
Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
This commit is contained in:
parent
27392a3b48
commit
acb69a7beb
|
@ -52,10 +52,10 @@ release:
|
||||||
$ git checkout -b release-notes
|
$ git checkout -b release-notes
|
||||||
$ git add doc/manual/src/release-notes/rl-$VERSION.md
|
$ git add doc/manual/src/release-notes/rl-$VERSION.md
|
||||||
$ git commit -a -m 'Release notes'
|
$ git commit -a -m 'Release notes'
|
||||||
$ git push --set-upstream edolstra release-notes
|
$ git push --set-upstream $REMOTE release-notes
|
||||||
```
|
```
|
||||||
|
|
||||||
* Create a PR for `release-notes` and auto-merge it.
|
* Create a PR for `release-notes`.
|
||||||
|
|
||||||
* Wait for the PR to be merged.
|
* Wait for the PR to be merged.
|
||||||
|
|
||||||
|
@ -122,17 +122,16 @@ release:
|
||||||
`/home/eelco/Dev/nix-pristine` and
|
`/home/eelco/Dev/nix-pristine` and
|
||||||
`/home/eelco/Dev/nixpkgs-pristine`.
|
`/home/eelco/Dev/nixpkgs-pristine`.
|
||||||
|
|
||||||
|
TODO: trigger nixos.org netlify: https://docs.netlify.com/configure-builds/build-hooks/
|
||||||
* Prepare for the next point release by editing `.version` to
|
* Prepare for the next point release by editing `.version` to
|
||||||
e.g.
|
e.g.
|
||||||
|
|
||||||
```console
|
```console
|
||||||
$ echo -n 2.12.1 > .version
|
$ echo 2.12.1 > .version
|
||||||
$ git commit -a -m 'Bump version'
|
$ git commit -a -m 'Bump version'
|
||||||
$ git push
|
$ git push
|
||||||
```
|
```
|
||||||
|
|
||||||
Note the `-n`: `.version` must not end in a newline.
|
|
||||||
|
|
||||||
Commit and push this to the maintenance branch.
|
Commit and push this to the maintenance branch.
|
||||||
|
|
||||||
* Bump the version of `master`:
|
* Bump the version of `master`:
|
||||||
|
@ -173,3 +172,8 @@ release:
|
||||||
|
|
||||||
* Bump the version number of the release branch as above (e.g. to
|
* Bump the version number of the release branch as above (e.g. to
|
||||||
`2.12.2`).
|
`2.12.2`).
|
||||||
|
|
||||||
|
## Recovering from mistakes
|
||||||
|
|
||||||
|
`upload-release.pl` should be idempotent. For instance a wrong `IS_LATEST` value can be fixed that way, by running the script on the actual latest release.
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue