Table of Contents

Summary

We have two principal branches:

The master branch, that contains the latest version of the project.
The gh-pages branch is the commit that is hosted on https://glowing-bear.github.io/glowing-bear and is considered stable.

Once in a while we want to do a release of the project by deploying master on gh-pages

Actions

If the release contains new features we should announce our intention of releasing on #glowing-bear to give potential testers enough time to test
We should make sure that the automatic tests are passing
Some manual testing should be done as well

On branch master, bump versions in index.html (settings dialog), manifest.json, package.json, manifest.webapp, and bower.json
Commit the changes
Tag the commit
Merge master into gh-pages
- Make sure to resolve potential conflicts in the JavaScript includes from minification. This requires rebasing use-minification onto master (and force-pushing the result).
On branch gh-pages, minify the JavaScript files with npm run minify and commit min.js and min.map
Push to origin (and don't forget to push the tags as well)