Merge pull request #305 from zalando/topic/304-update-release-scripts

Topic/304 update release scripts

docs/guides/RELEASING.md

@@ -9,28 +9,39 @@
 npm run release [<newversion> | major | minor | patch]
 ```
 
-2) Open a PR from `develop` to `master` using the release branch that was just pushed.
+2) A release branch will be created and pushed automatically. Open a PR from the release branch to `develop`.
 
+3) After the release branch is merged into `develop`, open a PR from `develop` to `master`.
 
-3) After the PR is merged, pull the `master` branch and deploy [docs/demo](http://zalando.github.io/dress-code/) artifacts.
+4) After the PR is merged, publish on npm registry. After publish completes, the `npm` version will be verified.
 
 ```
-git checkout master;
-git pull;
-npm run deploy:demo;
+git checkout master
+git pull
+npm publish
 ```
 
-4) Publish on npm registry. After publish completes, both `npm` and `bower` versions will be verified.
+5) Upon successful publish, create and push the tag. The following command will do both steps automatically.
 
 ```
-npm publish
+npm run tag:release
 ```
 
-5) Keep in sync the develop branch.
+6) From the `master` branch, deploy [docs/demo](http://zalando.github.io/dress-code/) artifacts.
 
 ```
-git checkout develop;
-git rebase master; # or git merge
-git push origin develop;
+git checkout master
+git pull
+npm run deploy:demo
+```
+
+7) Keep the develop branch in sync.
+
+```
+git checkout topic/<issue-number-and-description>
+git rebase master   # or git merge
+git push origin topic/<issue-number-and-description>
+
+# Now open a PR from the topic branch to develop. 
 ```
 

package.json

@@ -10,18 +10,16 @@
     "build:demo": "gulp demo:build",
     "deploy:demo": "gulp demo:deploy --demo-base-path=/dress-code",
     "start": "gulp",
-    "preversion": "git add . && echo Updating to version $npm_package_version",
     "postversion": "npm run changelog",
     "changelog": "gulp dist:changelog",
-    "postchangelog": "git add CHANGELOG.md",
-    "prerelease": "npm run build",
+    "postchangelog": "npm run build && git add .",
     "release": "npm --no-git-tag-version version $v",
-    "postrelease": "npm run branch:release && npm run commit:release && npm run tag:release && npm run push:release",
+    "postrelease": "npm run branch:release && npm run commit:release && npm run push:release",
     "branch:release": "git checkout -b release/$npm_package_version",
     "commit:release": "git commit -am \"chore(release): $npm_package_version\"",
-    "tag:release": "git tag -a $npm_package_version -m \"$npm_package_version\"",
-    "push:release": "git push origin release/$npm_package_version && git push origin $npm_package_version",
-    "postpublish": "npm run verify",
+    "tag:release": "git tag -a $npm_package_version -m \"$npm_package_version\" && git push origin $npm_package_version",
+    "push:release": "git push origin release/$npm_package_version",
+    "postpublish": "npm run verify:npm",
     "verify": "npm run verify:npm && npm run verify:bower",
     "verify:npm": "npm view $npm_package_name version",
     "verify:bower": "bower info $npm_package_name version"