From acb69a7beb434e5a5a25462f6d4e38d771eca7a1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Dec 2022 13:29:50 +0100 Subject: Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Théophane Hufschmitt <7226587+thufschmitt@users.noreply.github.com> Co-authored-by: Robert Hensing --- maintainers/release-process.md | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/maintainers/release-process.md b/maintainers/release-process.md index 27452b37e..565539bf6 100644 --- a/maintainers/release-process.md +++ b/maintainers/release-process.md @@ -52,10 +52,10 @@ release: $ git checkout -b release-notes $ git add doc/manual/src/release-notes/rl-$VERSION.md $ 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. @@ -122,17 +122,16 @@ release: `/home/eelco/Dev/nix-pristine` and `/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 e.g. ```console - $ echo -n 2.12.1 > .version + $ echo 2.12.1 > .version $ git commit -a -m 'Bump version' $ git push ``` - Note the `-n`: `.version` must not end in a newline. - Commit and push this to the maintenance branch. * Bump the version of `master`: @@ -173,3 +172,8 @@ 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. + -- cgit v1.2.3