Skip to content

Commit

Permalink
Merge pull request #42 from NixOS/feat/beta-phase
Browse files Browse the repository at this point in the history
Document the beta phase
  • Loading branch information
dasJ committed May 29, 2022
2 parents f2e0682 + 835a19e commit 82bf761
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 19 deletions.
9 changes: 9 additions & 0 deletions src/Beta-Phase.md
@@ -0,0 +1,9 @@
# Beta Phase

- Monitor the master branch for bugfixes and minor updates and
cherry-pick them to the release branch.

- Start marking packages as broken. There is no fully defined process to do
this, so look at the corresponding
[issue](https://github.com/NixOS/release-wiki/issues/4) and also
[this discussion](https://github.com/NixOS/release-wiki/pull/42#discussion_r882695363).
15 changes: 15 additions & 0 deletions src/Final-Release.md
@@ -0,0 +1,15 @@
# Final Release

## Before the final release

- Two days before expected release date, change `stableBranch` to `true` in Hydra and wait for the channel to update

- Re-check that the release notes are complete

- Merge the Pull Request that marks broken packages as broken

- [Update README.md with new stable NixOS version information.](https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e) (for `master` then backport to the release branch)

- Ensure the following items are sufficiently tested:
- Graphical NixOS installer images (Can be found on nixos hydra jobset)
- Minimal NixOS installer images (Can be found on nixos hydra jobset)
19 changes: 0 additions & 19 deletions src/Release-Process-Walkthrough.md
@@ -1,24 +1,5 @@
# Release Process Walkthrough

## During Beta

- Monitor the master branch for bugfixes and minor updates and
cherry-pick them to the release branch.

## Before the final release

- Two days before expected release date, change `stableBranch` to `true` in Hydra and wait for the channel to update.

- Re-check that the release notes are complete.

- Release Nix (currently only Eelco Dolstra can do that). [Make sure fallback is updated.](https://github.com/NixOS/nixpkgs/blob/master/nixos/modules/installer/tools/nix-fallback-paths.nix)

- [Update README.md with new stable NixOS version information.](https://github.com/NixOS/nixpkgs/commit/40fd9ae3ac8048758abdcfc7d28a78b5f22fe97e) (for both `master` then backport to `release-19.09` branch)

- Ensure the following items are sufficiently tested:
- Graphical NixOS installer images (Can be found on nixos hydra jobset)
- Minimal NixOS installer images (Can be found on nixos hydra jobset)

## At final release time
Create these PRs on master and backport to release-19.09.

Expand Down
2 changes: 2 additions & 0 deletions src/SUMMARY.md
Expand Up @@ -9,4 +9,6 @@
cleanup](Feature-Freeze-Announcement.md)
- [ZERO Hydra Failures](Zero-Hydra-Failures.md)
- [Branch-off](Branch-Off.md)
- [Beta Phase](Beta-Phase.md)
- [Final Release](Final-Release.md)
- [Release Process Walkthrough](Release-Process-Walkthrough.md)

0 comments on commit 82bf761

Please sign in to comment.