From 951efe41e1c3a1d0086a563b128a62126845a4c1 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 16 Aug 2020 03:59:29 +0200 Subject: [PATCH] fixup! nixos/doc/releases: update the docs as promised --- nixos/doc/manual/development/releases.xml | 45 +++++++++-------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/nixos/doc/manual/development/releases.xml b/nixos/doc/manual/development/releases.xml index e2634db2043..cd68a428a6f 100755 --- a/nixos/doc/manual/development/releases.xml +++ b/nixos/doc/manual/development/releases.xml @@ -41,14 +41,10 @@ From the master branch run: - - - git checkout -b release-19.09 - - + Bump the system.defaultChannel attribute in nixos/modules/misc/version.nix @@ -79,12 +75,10 @@ git rev-list --count release-19.09 Get all new NixOS modules: - - git diff release-19.03..release-19.09 nixos/modules/module-list.nix | grep ^+ - + Note systemd, kernel, glibc, desktop environment, and Nix upgrades. @@ -96,27 +90,19 @@ git diff release-19.03..release-19.09 nixos/modules/module-list.nix | grep ^+ Tag the release: - - - git tag --annotate --message="Release 19.09-beta" 19.09-beta git push upstream 19.09-beta - - + On the master branch, increment the .version file - - - echo -n "20.03" > .version - - + Update codeName in lib/trivial.nix This will be the name for the next release. @@ -195,7 +181,7 @@ echo -n "20.03" > .version - Update Chapter 4. Upgrading NixOS section of the manual to match new stable release version. + Update section of the manual to match new stable release version. @@ -207,15 +193,11 @@ echo -n "20.03" > .version Tag the final release - - - git tag --annotate --message="Release 19.09" 19.09 git push upstream 19.09 - - + Update nixos-homepage for the release. @@ -261,20 +243,27 @@ git push upstream 19.09 - You should include the following information: - Number of commits for the release: bash git log release-19.03..release-19.09 --format=%an | wc -l + You should include the following information: + + + Number of commits for the release: + + +bash git log release-19.03..release-19.09 --format=%an | wc -l + + Commits by contributor: - - - git shortlog --summary --numbered release-19.03..release-19.09 + + Best to check how the previous post was formulated to see what needs to be included.