From 356e3744fbe79b23e608b8f4ec1b8204986b8f8e Mon Sep 17 00:00:00 2001 From: "Gary V. Vaughan" Date: Sun, 23 Oct 2011 13:13:46 +0700 Subject: [PATCH] readme-release: improve safety of release prep instructions. * README-release: Don't git pull all branches when only master is needed for the release process. Run make maintainer-clean before changing trees and merging. Don't try to run ./configure right after git pull in case files that influence the bootstrap process have changed, move the ./configure step to after running ./bootstrap. Don't bootstrap "one last time"... it's the first time! --- ChangeLog | 13 +++++++++++++ top/README-release | 14 ++++++-------- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3618be972f..93ee45e6fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2011-10-23 Gary V. Vaughan + Bruno Haible + Jim Meyering + + readme-release: improve safety of release prep instructions. + * README-release: Don't git pull all branches when only master + is needed for the release process. + Run make maintainer-clean before changing trees and merging. + Don't try to run ./configure right after git pull in case files + that influence the bootstrap process have changed, move the + ./configure step to after running ./bootstrap. + Don't bootstrap "one last time"... it's the first time! + 2011-10-22 Bruno Haible errno, strerror-override: Support for MSVC 10. diff --git a/top/README-release b/top/README-release index 0299c82361..d9f86b1553 100644 --- a/top/README-release +++ b/top/README-release @@ -2,9 +2,9 @@ Here are most of the steps we (maintainers) follow when making a release. * start from a clean, up-to-date git directory. - git checkout master; git pull - -* Run ./configure && make maintainer-clean + make -k maintainer-clean || { ./configure && make maintainer-clean; } + git checkout master + git pull origin master * Ensure that the desired versions of autoconf, automake, etc. are in your PATH. See the buildreq list in bootstrap.conf for @@ -16,14 +16,12 @@ Here are most of the steps we (maintainers) follow when making a release. * Ensure that you've pushed all changes that belong in the release and that the NixOS/Hydra autobuilder is reporting all is well: - http://hydra.nixos.org/jobset/gnu/@PACKAGE@-master - -* Run bootstrap one last time. This downloads any new translations: + http://hydra.nixos.org/jobset/gnu/@PACKAGE@-master - ./bootstrap +* Run "./bootstrap && ./configure". This downloads any new translations: * Pre-release testing: - Ensure that make check syntax-check succeeds. + Ensure that "make check syntax-check" succeeds. * Run "make distcheck" -- 2.39.5