From 9c834c68e9590456e6ecd2c13a0b4a9fbb76b6e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenz=20H=C3=BCbschle-Schneider?= Date: Mon, 18 Jan 2016 20:45:41 +0100 Subject: [PATCH] Document version number foobar --- Releasing.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Releasing.md b/Releasing.md index 1b8bab5..d6e42f7 100644 --- a/Releasing.md +++ b/Releasing.md @@ -12,12 +12,12 @@ Once in a while we want to do a release of the project by deploying master on gh * Some [manual testing](https://github.com/glowing-bear/glowing-bear/wiki/Manual-testing-checklist) should be done as well ## When releasing -* Bump versions in `manifest.json`, `package.json` and `manifest.webapp` +* 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` in `gh-pages` +* 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). -* Minify the JavaScript files with `npm run minify` and commit `min.js` and `min.map` +* 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) ## After releasing