From 2b5d3bbceba658b72cca1a54f7adf71643d3bffc Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 14 Aug 2017 13:11:27 +0200 Subject: Update instructions for bugfix-only release --- release-bugfix-only.txt | 55 ++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 30 deletions(-) (limited to 'release-bugfix-only.txt') diff --git a/release-bugfix-only.txt b/release-bugfix-only.txt index 7b7f44f..caae114 100644 --- a/release-bugfix-only.txt +++ b/release-bugfix-only.txt @@ -1,51 +1,46 @@ -@@ Probably outdated (compare to release.txt). +- Create X.Y branch if first bugfix release -- See if makes sense to cherry-pick other fixes/changes - -- Update NEWS + git branch X.Y X.Y.0 + git checkout X.Y -- Update version in vesion, manifest, build/bootstrap.build, version.hxx - -- Regenerate odb.sh, cli.sh - -- b 'dist(-default/)' +- See if makes sense to cherry-pick other fixes/changes - sha256sum -b ... - copy to build-0.X, cppget.org/.../queue +- Update NEWS if anything major, commit -- Regenerate queue using current release toolchain +- Update version in manifest, cli.sh, commit: - cd cppget.org - ./update -t ../etc1/install/0.X.0 repository/1/queue/ + git ci -a -m "Bump version to X.Y.N" - ./test -t ../etc1/install/0.X.0 -c cxx \ - -c config.cxx.loptions=-L/usr/local/lib \ - -c config.cxx.poptions="-I/usr/include/apache2 -I/usr/include/apr-1.0" \ - repository/1/queue/ +- Regenerate odb.sh, cli.sh -- Stage queue +- Dist to queue: - etc/stage + etc/stage-pkg -q -d -c -- Perform any additional tests on queue (depending on the project) +- @@ TODO: Test queue. -- Move packages from queue to alpha, regenerate repositories. +- @@ TODO: Might need to rebuild build2-toolchain. - cd cppget.org - ./update -t ../etc1/install/0.X.0 repository/1/ +- Move package from queue to the appropriate repository, normally + replacing the old package. -- Publish to production (build2.org/cppget.org). +- Regenerate the repository and publish (remove -p if also publishing + build2-toolchain): - etc/publish 0.X + cd cppget.org + git -C repository add . + git -C repository status + ./update -- Might need to rebuild a copy of the toolchain (see release.txt) + cd .. + etc/publish -p -- Commit, tag, and push project +- Tag the bugfix release: git tag -a X.Y.Z -m "Tag version X.Y.Z" -- Commit and push cppget.org +- Commit cppget.org/repository/ (see history for procedure) - Write and send announcements, remember to include checksum. -- Checkout master, regenerate odb.sh, cli.sh +- Switch back to master and regenerate cli.sh/odb.sh -- cgit v1.1