Update release checklist

2 files changed, 34 insertions, 45 deletions

diff --git a/docs/checklist_for_leap_client_release.wiki b/docs/checklist_for_leap_client_release.wiki
deleted file mode 100644
index d3bdf1ee..00000000
--- a/docs/checklist_for_leap_client_release.wiki
+++ /dev/null
@@ -1,45 +0,0 @@
-= LEAP CLient Release Checklist (*) =
-
-  * [ ] validate rc
-    * [ ] all rc-critical closed!
-    * [ ] all bbots green
-    * [ ] uploaded translations: make translations
-    * [ ] re-generate pyside resources
-    
-  * [ ] update docs
-    * [ ] CREDITS
-    * [ ] relnotes.txt
-    * [ ] docs/known_issues.rst
-    * [ ] NEWS.rst: Add release name and date to top-most item in NEWS.
-
-  * [ ] change docs/quickstart.rst to point to just the current
-    leap-client-X.Y.Z.deb binaries and .tar.gz source code files
-  * [ ] on release/vX.Y.Z branch: git pull
-  * [ ] git tag X.Y.Z
-  * [ ] build locally to make sure the release is reporting itself as the
-    intended version (FIXME!)
-  * [ ] make sure buildbot is green
-  * [ ] make sure other people aren't committing at that moment
-  * [ ] FUTURE: push tag along with some other documentation-only patch (typically to
-    relnotes.txt) to trigger buildslaves
-    * [ ] git push --tags official; git push official
-    * [ ] that will build tarballs
-  * [ ] make sure buildbot is green (in a parallel universe, he)
-  * [ ] download tarballs, sign with "gpg -ba -u deadbeef TAR", upload *.asc
-  * [ ] symlink the release tarball on leap.se downloads page:
-    /var/www/source/leap-client/releases/ CHANGEME XXX
-    
-  * [ ] update news pages. release notes.
-  * [ ] send out relnotes.txt to internal list.
-  * [ ] wait ...?
-
-  * [ ] PYPI UPLOAD: with "python ./setup.py sdist upload register"
-
-  * [ ] make an "announcement of new release" on leap.se
-  * [ ] close the Milestone on the chili Roadmap
-  * [ ] send out relnotes.txt to:
-    * [ ] mailing lists... 
-     
-notes
------
-(*) this checklist kindly borrowed from tahoe-lafs documentation =)
diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki
new file mode 100644
index 00000000..8987f0b8
--- /dev/null
+++ b/docs/release_checklist.wiki
@@ -0,0 +1,34 @@
+= Bitmask Release Checklist (*) =
+  * [ ] Tag everything
+    * Should be done for the following packages, in order:
+      1. leap.common
+      2. leap.keymanager
+      3. leap.soledad
+      4. leap.mail
+      5. leap.bitmask
+      6. leap.mx
+    * NOTE: It's assumed that origin is the leap.se repo
+    * [ ] git fetch origin
+    * [ ] git tag -l, and see the latest tagged version (unless it's not a minor version bump, in which case, just bump to it)
+    * [ ] Checkout release-X.Y.Z (locally, never pushed)
+    * [ ] Fold in changes files into the CHANGELOG
+      - NOTE: For leap.soledad, the CHANGELOG entries should be divided per package (common, client, server). See older releases for reference.
+      - Helper bash line: for i in $(ls changes); do cat changes/$i; echo; done
+    * [ ] Update relnotes.txt if needed.
+    * [ ] git rm changes/*
+    * [ ] git commit -av
+    * [ ] Update dependencies on the current package in the packages that remain if needed (that's why the order).
+    * [ ] git tag -s X.Y.Z (note the -s so that it's a signed tag) The message should be something like: Tag <package> version X.Y.Z
+    * [ ] git push origin X.Y.Z
+    * [ ] git checkout master && git pull origin master && git merge release-X.Y.Z && git push origin master
+    * [ ] git checkout develop && git pull origin develop && git merge release-X.Y.Z && git push origin develop
+  * [ ] Build bundles
+    * [ ] Use the scripts under pkg/<os>/ to build the the bundles.
+    * [ ] Sign them with gpg -a <path/to/bundle>
+    * [ ] Upload bundle and signature to web-uploads@salmon.leap.se:~/public/client/<os>/
+  * [ ] Announce
+    * [ ] Mail leap@lists.riseup.net
+
+Notes
+-----
+(*) this checklist kindly borrowed from tahoe-lafs documentation =)