Merge branch 'logging' into next

[sup] / release-script.txt

diff --git a/release-script.txt b/release-script.txt
index f3ff2aec670817dba9e4a5ec6a2fead2191c256c..3b5b5694e9dd30b0391c1ab84f2c3791194b92f4 100644 (file)
--- a/release-script.txt
+++ b/release-script.txt
@@ -6,11 +6,17 @@ cat History.txt >> tmp.txt
 mv tmp.txt History.txt
 vi History.txt    # and cleanup
 vi ReleaseNotes   # and add whatever's necessary
-vi lib/sup.rb     # and bump version number
 vi www/index.html # and bump version number
-rake release VERSION=<releasename>
-git commit -a -v
-git tag -a release-<releasename> -m "release <releasename>"
-git push
-git push --tags
+git rank-contributors -o > CONTRIBUTORS
+vi CONTRIBUTORS   # and merge
+vi www/index.html # and include CONTRIBUTORS
+# ... git add, commit, etc
+git checkout -b release-<releasename>
+vi lib/sup.rb bin/sup # and bump BOTH version numbers
+# ... git add, commit, etc
+rake gem
+rake tarball
+# manually upload
+git publish-branch
+rake upload_webpage
 rake upload_report