Merge pull request #29 from bustlelabs/update-conventional-changelog

update conventional-changelog dep and change release steps in readme

README.md

@@ -107,8 +107,10 @@ var rendered = renderer.render(mobiledoc);
 
 ### Releasing
 
-* `npm version patch` or `minor` or `major`
+* Update version in `package.json`
 * `npm run build`
 * `npm run update-changelog`
-* `git push bustle --tags`
+* `git commit -m 'v<version>'` # e.g. git commit -m 'v1.2.0'
+* `git tag v<version>`
+* `git push --tags`
 * `npm publish`

package.json

@@ -5,7 +5,7 @@
   "scripts": {
     "test": "testem ci",
     "build": "rm -rf dist/ && broccoli build dist",
-    "update-changelog": "./node_modules/conventional-changelog/cli.js -i CHANGELOG.md -r 0 --overwrite && git add CHANGELOG.md && git commit -m 'Update changelog'"
+    "update-changelog": "conventional-changelog -i CHANGELOG.md -r 0 -s"
   },
   "repository": {
     "type": "git",
@@ -33,7 +33,8 @@
     "broccoli-merge-trees": "^0.2.1",
     "broccoli-multi-builder": "^0.2.6",
     "broccoli-test-builder": "^0.2.0",
-    "conventional-changelog": "^0.5.1",
+    "conventional-changelog": "^1.1.0",
+    "conventional-changelog-cli": "^1.1.1",
     "simple-dom": "^0.2.7",
     "testem": "^0.9.0-1"
   },