Skip to content

Commit

Permalink
Apply suggestions from code review
Browse files Browse the repository at this point in the history
Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io>
  • Loading branch information
edolstra and fricklerhandwerk authored Dec 12, 2022
1 parent acb69a7 commit 6eed132
Showing 1 changed file with 8 additions and 8 deletions.
16 changes: 8 additions & 8 deletions maintainers/release-process.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ release:

* An updated manual on https://nixos.org/manual/nix/stable/

## Creating a new release from master
## Creating a new release from the `master` branch

* Make sure that https://hydra.nixos.org/jobset/nix/master is green.
* Make sure that the [Hydra `master` jobset](https://hydra.nixos.org/jobset/nix/master) succeeds.

* In a checkout of the Nix repo, make sure you're on `master` and do a
* In a checkout of the Nix repo, make sure you're on `master` and run
`git pull`.

* Move the contents of `doc/manual/src/release-notes/rl-next.md`
Expand Down Expand Up @@ -103,18 +103,18 @@ release:

* When the jobset evaluation has succeeded building, take note of the
evaluation ID (e.g. `1780832` in
https://hydra.nixos.org/eval/1780832).
`https://hydra.nixos.org/eval/1780832`).

* Tag the release and upload the release artifacts to
`releases.nixos.org` and dockerhub:
[`releases.nixos.org`](https://releases.nixos.org/) and [Docker Hub](https://hub.docker.com/):

```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.
[latest Nix manual](https://nixos.org/manual/nixpkgs/unstable/).

TODO: This script requires the right AWS credentials. Document.

Expand Down Expand Up @@ -146,13 +146,13 @@ release:
$ git push --set-upstream origin bump-$NEW_VERSION
```

Make a PR and auto-merge it.
Make a pull request and auto-merge it.

* 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.

* Post an announcement on Discourse, including the contents of
* Post an [announcement on Discourse](https://discourse.nixos.org/c/announcements/8), including the contents of
`rl-$VERSION.md`.

## Creating a point release
Expand Down

0 comments on commit 6eed132

Please sign in to comment.