From 067260da1cdcc17ef8155a86df6114a53cb0c61c Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Thu, 23 Jul 2020 08:16:01 +0200
Subject: Add additional notes to release doc

---
 doc/release.cli | 30 +++++++++++++++++++++++++-----
 1 file changed, 25 insertions(+), 5 deletions(-)

diff --git a/doc/release.cli b/doc/release.cli
index 2569a7d..9a83a44 100644
--- a/doc/release.cli
+++ b/doc/release.cli
@@ -17,6 +17,10 @@
 Review the state and services list (currently on paper) for any new additions.
 Consider how/when they are updated/tested during the release process.
 
+@@ We currently have an issue in that \c{queue} builds \c{public} using
+\c{public} \c{buildtabs} (since it's querying \c{public} brep) which means
+existing packages are not tested with new build configurations. But maybe
+that's correct, conceptually.
 
 \h1#stage|Stage|
 
@@ -88,6 +92,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   \l{https://github.com/build2-packaging/README#version-and-release-management
   Version and Release Management}.
 
+  Also, consider upgrading the \c{curl/ca-certificates-curl}.
+
   \N|Maybe this should be done during queuing? Why do we release (but not
      publish) these now and other dependencies later? Maybe so that we can
      stage them one more time?|
@@ -215,6 +221,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   \
   cd private/buildos/
 
+  grep '.*' .../brep-buildtab | cut -d' ' -f1 | sort -u
   ./ls-machines -c stage -c devel
 
   ~/work/buildos/remove-machine <host> <machine>
@@ -226,7 +233,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   \
   cd private/buildos/
 
-  ./ls-machines -l \"/btrfs/$(whoami)/machines/default/\"
+  ./ls-machines -l \"/btrfs/$(whoami)/machines/default/\" | sort
   ./ls-machines -c stage -c devel
 
   ~/work/build2/buildos/upload-machine <host> .../new-ver .../old-ver
@@ -243,6 +250,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   If no upgrade is possible from the previous version, uncomment errors in
   install scripts (and add a note to restore after the release).
 
+  Enable extra packages for testing in \c{etc/stage} script.
+
   Restage and upgrade \c{brep} by performing the following steps:
 
   \ol|
@@ -469,7 +478,7 @@ distribution from \c{etc/stage} and add the pre-distributed packages
 \h#queuing|Queue|
 
    Prepare packages and the toolchain distribution (disable extra packages
-   first if any were enabled in the \c{stage} script):
+   first if any were enabled in the \c{etc/stage} script):
 
    \
    etc/stage -q -b
@@ -607,12 +616,17 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   \
   cd private/buildos/
 
+  grep '.*' .../brep-buildtab | cut -d' ' -f1 | sort -u
   ./ls-machines -c public
 
   ~/work/build2/buildos/remove-machine <host> <machine>
   \
 
-  Then move now legacy machines to the \"legacy\" build host.
+  Then move now legacy machines to the \"legacy\" build host:
+
+  \
+  grep 'legacy' .../brep-buildtab | cut -d' ' -f1 | sort -u
+  \
 
   Also review deployed machines against the latest available versions and
   upgrade those that are not the latest:
@@ -620,13 +634,17 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   \
   cd private/buildos/
 
-  ./ls-machines -l \"/btrfs/$(whoami)/machines/default/\"
+  ./ls-machines -l \"/btrfs/$(whoami)/machines/default/\" | sort
   ./ls-machines -c public
 
   ~/work/build2/buildos/upload-machine <host> .../new-ver .../old-ver
   \
 
-  Finally, add any new machines.
+  Finally, add any new machines:
+
+  \
+  grep -v 'legacy' .../brep-buildtab | cut -d' ' -f1 | sort -u
+  \
 
   Uncomment the \c{public} toolchain in the build host configuration and
   regenerate. The only remaining step is to reboot (not yet):
@@ -778,6 +796,8 @@ distribution from \c{etc/stage} and add the pre-distributed packages
   Essentially, the same steps as in \l{#version-release Change to
   release version} (but no tagging).
 
+  Revert changes to install scripts if upgrade was disabled.
+
 \h#stage-machines-reopen|Update \c{stage} \c{buildtab}s and build machines|
 
   Essentially, the same steps as in \l{#public-machines Update \c{public}
-- 
cgit v1.1