nix/maintainers/release-process.md

252 lines
6.8 KiB
Markdown
Raw Permalink Normal View History

2022-12-06 13:12:05 +00:00
# Nix release process
## Release artifacts
The release process is intended to create the following for each
release:
* A Git tag
* Binary tarballs in https://releases.nixos.org/?prefix=nix/
* Docker images
* Closures in https://cache.nixos.org
* (Optionally) Updated `fallback-paths.nix` in Nixpkgs
* An updated manual on https://nix.dev/manual/nix/latest/
2022-12-06 13:12:05 +00:00
## Creating a new release from the `master` branch
2022-12-06 13:12:05 +00:00
* Make sure that the [Hydra `master` jobset](https://hydra.nixos.org/jobset/nix/master) succeeds.
2022-12-06 13:12:05 +00:00
* In a checkout of the Nix repo, make sure you're on `master` and run
2022-12-06 13:12:05 +00:00
`git pull`.
2023-11-19 15:49:11 +00:00
* Compile the release notes by running
2022-12-06 13:12:05 +00:00
2023-11-19 15:49:11 +00:00
```console
2024-01-29 15:50:55 +00:00
$ export VERSION=X.YY
2023-11-19 15:49:11 +00:00
$ git checkout -b release-notes
2024-01-29 15:50:55 +00:00
$ ./maintainers/release-notes
2022-12-06 13:12:05 +00:00
```
2023-11-19 15:49:11 +00:00
where `X.YY` is *without* the patch level, e.g. `2.12` rather than ~~`2.12.0`~~.
2022-12-06 13:12:05 +00:00
2023-11-19 15:49:11 +00:00
A commit is created.
2022-12-06 13:12:05 +00:00
2023-11-19 15:49:11 +00:00
* Proof-read / edit / rearrange the release notes if needed. Breaking changes
and highlights should go to the top.
2022-12-06 13:12:05 +00:00
* Run `maintainers/release-credits` to make sure the credits script works
and produces a sensible output. Some emails might not automatically map to
a GitHub handle.
2023-11-19 15:49:11 +00:00
* Push.
2022-12-06 13:12:05 +00:00
```console
$ git push --set-upstream $REMOTE release-notes
2022-12-06 13:12:05 +00:00
```
* Create a PR for `release-notes`.
2022-12-06 13:12:05 +00:00
* Wait for the PR to be merged.
* Create a branch for the release:
2022-12-06 13:12:05 +00:00
```console
$ git checkout master
$ git pull
$ git checkout -b $VERSION-maintenance
```
2023-11-19 15:49:11 +00:00
* Mark the release as official:
2022-12-06 13:12:05 +00:00
```console
2023-11-19 15:49:11 +00:00
$ sed -e 's/officialRelease = false;/officialRelease = true;/' -i flake.nix
2022-12-06 13:12:05 +00:00
```
This removes the link to `rl-next.md` from the manual and sets
`officialRelease = true` in `flake.nix`.
2023-11-19 15:49:11 +00:00
* Commit
2022-12-06 13:12:05 +00:00
* Push the release branch:
```console
2022-12-06 16:07:51 +00:00
$ git push --set-upstream origin $VERSION-maintenance
2022-12-06 13:12:05 +00:00
```
* Create a jobset for the release branch on Hydra as follows:
* Go to the jobset of the previous release
(e.g. https://hydra.nixos.org/jobset/nix/maintenance-2.11).
* Select `Actions -> Clone this jobset`.
* Set identifier to `maintenance-$VERSION`.
* Set description to `$VERSION release branch`.
* Set flake URL to `github:NixOS/nix/$VERSION-maintenance`.
* Hit `Create jobset`.
* Wait for the new jobset to evaluate and build. If impatient, go to
the evaluation and select `Actions -> Bump builds to front of
queue`.
* When the jobset evaluation has succeeded building, take note of the
evaluation ID (e.g. `1780832` in
`https://hydra.nixos.org/eval/1780832`).
2022-12-06 13:12:05 +00:00
* Tag the release and upload the release artifacts to
[`releases.nixos.org`](https://releases.nixos.org/) and [Docker Hub](https://hub.docker.com/):
2022-12-06 13:12:05 +00:00
```console
$ IS_LATEST=1 ./maintainers/upload-release.pl <EVAL-ID>
```
Note: `IS_LATEST=1` causes the `latest-release` branch to be
force-updated. This is used by the `nixos.org` website to get the
[latest Nix manual](https://nixos.org/manual/nixpkgs/unstable/).
2022-12-06 13:12:05 +00:00
TODO: This script requires the right AWS credentials. Document.
TODO: This script currently requires a
2023-05-31 15:09:38 +00:00
`/home/eelco/Dev/nix-pristine`.
2022-12-06 13:12:05 +00:00
TODO: trigger nixos.org netlify: https://docs.netlify.com/configure-builds/build-hooks/
2023-02-28 17:16:07 +00:00
2022-12-06 13:12:05 +00:00
* Prepare for the next point release by editing `.version` to
e.g.
```console
$ echo 2.12.1 > .version
2022-12-06 13:12:05 +00:00
$ git commit -a -m 'Bump version'
$ git push
```
Commit and push this to the maintenance branch.
* Bump the version of `master`:
```console
$ git checkout master
2022-12-06 16:46:42 +00:00
$ git pull
$ NEW_VERSION=2.13.0
2023-05-31 15:09:38 +00:00
$ echo $NEW_VERSION > .version
2022-12-06 16:46:42 +00:00
$ git checkout -b bump-$NEW_VERSION
2022-12-06 13:12:05 +00:00
$ git commit -a -m 'Bump version'
2022-12-06 16:46:42 +00:00
$ git push --set-upstream origin bump-$NEW_VERSION
2022-12-06 13:12:05 +00:00
```
Make a pull request and auto-merge it.
2022-12-06 13:12:05 +00:00
2022-12-06 13:33:12 +00:00
* Create a milestone for the next release, move all unresolved issues
from the previous milestone, and close the previous milestone. Set
the date for the next milestone 6 weeks from now.
2023-02-28 17:16:07 +00:00
* Create a backport label.
* Post an [announcement on Discourse](https://discourse.nixos.org/c/announcements/8), including the contents of
2022-12-06 16:07:51 +00:00
`rl-$VERSION.md`.
2022-12-06 13:12:05 +00:00
## Creating a point release
* Checkout.
```console
$ git checkout XX.YY-maintenance
```
* Determine the next patch version.
```console
$ export VERSION=XX.YY.ZZ
```
* Update release notes.
```console
$ ./maintainers/release-notes
```
* Push.
```console
$ git push
```
2022-12-06 13:12:05 +00:00
* Wait for the desired evaluation of the maintenance jobset to finish
building.
* Run
```console
$ IS_LATEST=1 ./maintainers/upload-release.pl <EVAL-ID>
```
Omit `IS_LATEST=1` when creating a point release that is not on the
most recent stable branch. This prevents `nixos.org` to going back
to an older release.
* Bump the version number of the release branch as above (e.g. to
`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.
## Security releases
> See also the instructions for [handling security reports](./security-reports.md).
Once a security fix is ready for merging:
1. Summarize *all* past communication in the report.
1. Request a CVE in the [GitHub security advisory](https://github.com/NixOS/nix/security/advisories) for the security fix.
1. Notify all collaborators on the advisory with a timeline for the release.
1. Merge the fix. Publish the advisory.
1. [Make point releases](#creating-point-releases) for all affected versions.
1. Update the affected Nix releases in Nixpkgs to the patched version.
For each Nix release, change the `version = ` strings and run
```shell-session
nix-build -A nixVersions.nix_<major>_<minor>
```
to get the correct hash for the `hash =` field.
1. Once the release is built by Hydra, update fallback paths.
For the Nix release `${version}` shipped with Nixpkgs, run:
```shell-session
curl https://releases.nixos.org/nix/nix-${version}/fallback-paths.nix > nixos/modules/installer/tools/nix-fallback-paths.nix
```
Starting with Nixpkgs 24.11, there is an automatic check that fallback paths with Nix binaries match the Nix release shipped with Nixpkgs.
1. Backport the updates to the two most recent stable releases of Nixpkgs.
Add `backport release-<version>` labels, which will trigger GitHub Actions to attempt automatic backports.
1. Once the pull request against `master` lands on `nixpkgs-unstable`, post a Discourse announcement with
- Links to the CVE and GitHub security advisory
- A description of the vulnerability and its fix
- Credits to the reporters of the vulnerability and contributors of the fix
- A list of affected and patched Nix releases
- Instructions for updating
- A link to the [pull request tracker](https://nixpk.gs/pr-tracker.html) to follow when the patched Nix versions will appear on the various release channels
Check [past announcements](https://discourse.nixos.org/search?expanded=true&q=Security%20fix%20in%3Atitle%20order%3Alatest_topic) for reference.