summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--docs/release_checklist.wiki24
-rwxr-xr-xpkg/linux/build_bundle.sh12
2 files changed, 21 insertions, 15 deletions
diff --git a/docs/release_checklist.wiki b/docs/release_checklist.wiki
index b46eb1f6..fc99fdf0 100644
--- a/docs/release_checklist.wiki
+++ b/docs/release_checklist.wiki
@@ -12,18 +12,22 @@
* [ ] 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/*
+ * [ ] Update relnotes.txt in leap.bitmask if needed.
+
* [ ] Review pkg/requirements.pip for everything and update if needed (that's why the order).
- - See whatever has been introduced in changes/VERSION_COMPAT
- - Reset changes/VERSION_COMPAT
+ - See whatever has been introduced in changes/VERSION_COMPAT
+ - Reset changes/VERSION_COMPAT
* [ ] git commit -av # we should add a commit message here...
- * [ ] git checkout master && git pull origin master && git merge --no-ff release-X.Y.Z && git push origin master
- * [ ] git tag -s X.Y.Z -m "Tag <package> 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 X.Y.Z
+
+ * [ ] 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."
+
+ * [ ] 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 <package> 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
* [ ] Build and upload bundles
* [ ] Use the scripts under pkg/<os>/ to build the the bundles.
diff --git a/pkg/linux/build_bundle.sh b/pkg/linux/build_bundle.sh
index 520ff256..60151a80 100755
--- a/pkg/linux/build_bundle.sh
+++ b/pkg/linux/build_bundle.sh
@@ -34,16 +34,18 @@ BITMASK_BIN=$TEMPLATE_BUNDLE/bitmask
BUNDLE_NAME=Bitmask-linux$ARCH-$VERSION
# clean template
-rm $TEMPLATE_BUNDLE/CHANGELOG
-rm $TEMPLATE_BUNDLE/relnotes.txt
+rm -f $TEMPLATE_BUNDLE/CHANGELOG
+rm -f $TEMPLATE_BUNDLE/relnotes.txt
rm -rf $TEMPLATE_BUNDLE/apps/leap
rm -rf $TEMPLATE_BUNDLE/lib/leap/{common,keymanager,soledad,mail}
# checkout the latest tag in all repos
for repo in $REPOSITORIES; do
cd $REPOS_ROOT/$repo
- git fetch
- # checkout to the latest annotated tag, supress 'detached head' warning
+ git checkout master
+ git pull --ff-only origin master && git fetch
+ git reset --hard origin/master # this avoids problems if you are in a commit far in the past
+ # checkout to the closest annotated tag, supress 'detached head' warning
git checkout --quiet `git describe --abbrev=0`
done
@@ -82,7 +84,7 @@ cp src/launcher $BITMASK_BIN
# copy launcher.py to template bundle
# e.g. TEMPLATE_BUNDLE/Bitmask.app/Contents/MacOS/apps/
-cd $REPOS_ROOT/bitmask_client_launcher/src/
+cd $REPOS_ROOT/bitmask_launcher/src/
cp launcher.py $TEMPLATE_BUNDLE/apps/
# copy relnotes, joint changelog and LICENSE to TEMPLATE_BUNDLE