From c35d9f6338300dcf6f1688ee2df9475dd14b8c94 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 4 Apr 2016 22:49:56 -0400 Subject: [pkg] move the pyinstaller bundle to a child folder --- docs/release_checklist.wiki | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'docs/release_checklist.wiki') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index 075591a7..f831d965 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -1,6 +1,7 @@ = Bitmask Release Checklist (*) = * [ ] Check that all tests are passing! * [ ] Check that the version in bitmask_client/pkg/linux/bitmask-root is bumped if needed. + * [ ] Update pkg/next-release * [ ] Tag everything * Should be done for the following packages, in order: * [ ] 1. leap.common @@ -31,7 +32,7 @@ * [ ] git push origin master; git push origin X.Y.Z * [ ] git checkout develop && git merge master && git push origin develop * [ ] Build and upload bundles - * [ ] Use the scripts under pkg// to build the the bundles. + * [ ] Use 'make pyinst-linux' to build bundles. * [ ] Sign them with gpg -a --sign --detach-sign * [ ] Upload bundle and signature to downloads.leap.se/client//Bitmask--.(tar.bz2,dmg,zip) * [ ] Update symbolic link for latest upload and signature: -- cgit v1.2.3 From e442eb8a3acf8e6bbddaabe7af90cf66d2c755ac Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Fri, 15 Apr 2016 15:04:14 -0400 Subject: [doc] update release checklist --- docs/release_checklist.wiki | 79 ++++++++++++++++++++++++++++++++++----------- 1 file changed, 60 insertions(+), 19 deletions(-) (limited to 'docs/release_checklist.wiki') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index f831d965..7c9dae65 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -1,25 +1,39 @@ -= Bitmask Release Checklist (*) = += Bitmask Release Checklist = + + == CI check == * [ ] Check that all tests are passing! - * [ ] Check that the version in bitmask_client/pkg/linux/bitmask-root is bumped if needed. + * [ ] Fix any broken tests. + + == Version bumps and Tagging == * [ ] Update pkg/next-release - * [ ] Tag everything - * Should be done for the following packages, in order: + * [ ] Update release-notes.rst in leap.bitmask if needed. + * [ ] Update version in bitmask_client/pkg/linux/bitmask-root if needed. + + * [ ] 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 + + * [ ] export version: export RELEASE=0.9.0 * [ ] 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) - * [ ] Update relnotes.txt in leap.bitmask if needed. + * [ ] git checkout `release/0.9.x` + - NOTE: the release branch is created when the first release candidate + is tagged, after that the bugfixes and features that are meant to be + shipped with the specific version that we are targetting are merged in that branch + * [ ] git checkout -b release/$RELEASE + * [ ] (maybe) cherry-pick specific commits + * [ ] (maybe) add special fixes for this release - * [ ] Review pkg/requirements.pip for everything and update if needed (that's why the order). + * [ ] Review pkg/requirements.pip for everything, update if needed (that's why the order). - See whatever has been introduced in changes/VERSION_COMPAT - Reset changes/VERSION_COMPAT - * [ ] git commit -av # we should add a commit message here... + * [ ] git commit -am "Update requirements file." * [ ] 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. @@ -27,22 +41,49 @@ * [ ] git rm changes/feature*; git rm changes/bug* * [ ] git commit -m "Fold in changes." - * [ ] git checkout master && git pull origin master && git merge --no-ff release-X.Y.Z --no-edit - * [ ] git tag -s X.Y.Z -m "Tag version X.Y.Z" # (note the -s so that it's a signed tag and -m to specify the message for the tag) - * [ ] git push origin master; git push origin X.Y.Z - * [ ] git checkout develop && git merge master && git push origin develop + * [ ] git tag --sign $RELEASE -m "Tag leap.bitmask version $RELEASE" + + * If everything went ok, push the changes, and merge back into master&develop: + * [ ] git push origin release/0.9.x + * [ ] git push origin $RELEASE + * [ ] git checkout master && git pull origin master && git merge --no-ff $RELEASE --no-edit + * [ ] git checkout develop && git merge $RELEASE && git push origin develop + + == Bundles == * [ ] Build and upload bundles * [ ] Use 'make pyinst-linux' to build bundles. - * [ ] Sign them with gpg -a --sign --detach-sign + * [ ] Sign: make pyinst-sign * [ ] Upload bundle and signature to downloads.leap.se/client//Bitmask--.(tar.bz2,dmg,zip) + * [ ] make pyinst-upload * [ ] Update symbolic link for latest upload and signature: * [ ] ~/public/client/Bitmask--latest * [ ] ~/public/client/Bitmask--latest.asc - * [ ] Announce - * [ ] Mail leap@lists.riseup.net -Notes ------ -(*) this checklist kindly borrowed from tahoe-lafs documentation =) + === TUF: Relese candidate bundles: RC# (skipped for now) === + * [ ] Upload the TUF unstable repo + * [ ] Upload bundle to staging for release-candidate + * [ ] Sign the bundles, move it to client downloads (micah) + * [ ] Update symlinks for -latest + * [ ] Fix all show stoppers -For a good reference look at http://nvie.com/posts/a-successful-git-branching-model/ + === TUF: Stable bundles (skipped for now) === + * [ ] Upload the TUF Stable Repo to staging + * [ ] Upload bundle to staging for stable + * [ ] move and sign the TUF repo (kwadro) + * [ ] Sign the bundles, move it to client downloads (micah) + * [ ] Update symlinks for -latest + + == Debian packages == + * TBD... + + == Pypi upload == + * [ ] python setup.py sdist upload --sign -i kali@leap.se -r pypi + + == Announcing == + * [ ] Announce (use release-notes.rst) + * [ ] Mail leap@lists.riseup.net + * [ ] Twitter + * [ ] Gnusocial + * [ ] Post in leap.se + * [ ] reddit + * [ ] hackernews -- cgit v1.2.3 From 7f6a008a5030ac1753d3e6876d7f3d46515823d0 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 18 Apr 2016 12:09:07 -0400 Subject: [docs] minor modifications to the release protocol --- docs/release_checklist.wiki | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'docs/release_checklist.wiki') diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki index 7c9dae65..95ff2204 100644 --- a/docs/release_checklist.wiki +++ b/docs/release_checklist.wiki @@ -19,34 +19,35 @@ * NOTE: It's assumed that origin is the leap.se repo - * [ ] export version: export RELEASE=0.9.0 * [ ] 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) + * [ ] export version: export RELEASE=0.9.0 * [ ] git checkout `release/0.9.x` - NOTE: the release branch is created when the first release candidate is tagged, after that the bugfixes and features that are meant to be shipped with the specific version that we are targetting are merged in that branch - * [ ] git checkout -b release/$RELEASE + * [ ] git checkout -b release/$RELEASE (this is a LOCAL branch, never published). * [ ] (maybe) cherry-pick specific commits * [ ] (maybe) add special fixes for this release * [ ] Review pkg/requirements.pip for everything, update if needed (that's why the order). - See whatever has been introduced in changes/VERSION_COMPAT - Reset changes/VERSION_COMPAT - * [ ] git commit -am "Update requirements file." + - Bump all the leap-requirements altogether. + * [ ] git commit -am "Update requirements file" - * [ ] 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 - * [ ] git rm changes/feature*; git rm changes/bug* - * [ ] git commit -m "Fold in changes." + * [ ] Merge changes/next-changelog.rst into the CHANGELOG + - NOTE: in leap.soledad, 3 sections (common, client, server). + * [ ] reset changes/next-changelog.rst + * [ ] git commit -S -m "[pkg] Update changelog" - * [ ] git tag --sign $RELEASE -m "Tag leap.bitmask version $RELEASE" + * [ ] git tag --sign $RELEASE -m "Tag version $RELEASE" * If everything went ok, push the changes, and merge back into master&develop: + * [ ] git checkout release/0.9.x && git merge $RELEASE * [ ] git push origin release/0.9.x * [ ] git push origin $RELEASE - * [ ] git checkout master && git pull origin master && git merge --no-ff $RELEASE --no-edit + * [ ] git checkout master && git pull origin master && git merge --no-edit $RELEASE * [ ] git checkout develop && git merge $RELEASE && git push origin develop == Bundles == -- cgit v1.2.3