Update bugfix release instructions

1 files changed, 32 insertions, 3 deletions

diff --git a/release-bugfix-only.txt b/release-bugfix-only.txt
index caae114..ebfda5d 100644
--- a/release-bugfix-only.txt
+++ b/release-bugfix-only.txt
@@ -7,19 +7,44 @@
 
 - Update NEWS if anything major, commit
 
-- Update version in manifest, cli.sh, commit:
+- Update version in manifest, cli.sh, commit and push:
 
   git ci -a -m "Bump version to X.Y.N"
+  git push
 
 - Regenerate odb.sh, cli.sh
 
+- If need to rebuild build2-toolchain:
+
+  - Create branch as above, then:
+
+    git submodule update --checkout
+
+  - Add the branch value for each entry in .gitmodules:
+
+    branch = X.Y
+
+  - Then checkout and commit updated submodules:
+
+    git submodule update --remote <submodule>
+
+  - Update version in manifest as above
+
+  - Regenerate odb.sh (may need to checkout old version or copy old),
+    cli.sh as above.
+
 - Dist to queue:
 
   etc/stage-pkg -q -d -c <group> <proj>
 
-- @@ TODO: Test queue.
+  If need to dist build2-toolchain, then rename X.Y.N-1 to X.Y.N in
+  private/baseutils, then:
 
-- @@ TODO: Might need to rebuild build2-toolchain.
+  etc/stage -b -p
+
+  Verify build2-toolchain works by building locally.
+
+- @@ TODO: Test queue.
 
 - Move package from queue to the appropriate repository, normally
   replacing the old package.
@@ -35,10 +60,14 @@
     cd ..
     etc/publish -p
 
+- Update download links if changed build2-toolchain.
+
 - Tag the bugfix release:
 
   git tag -a X.Y.Z -m "Tag version X.Y.Z"
 
+  Also in build2-toolchain if applicable.
+
 - Commit cppget.org/repository/ (see history for procedure)
 
 - Write and send announcements, remember to include checksum.