Merge branch 'release/0.7.5'

mrkmg · Jul 1, 2016 · 040721b · 040721b
2 parents 49d7c6f + 6535900
commit 040721b
Show file tree

Hide file tree

Showing 8 changed files with 238 additions and 206 deletions.
diff --git a/.release.json b/.release.json
@@ -1,7 +1,12 @@
 {
   "set_release_message": true,
   "pre_commit_commands": [
-    "npm test"
+    "npm test",
+    "rm main/* -rf",
+    "npm run compile"
+  ],
+  "files_to_commit": [
+    "main/**/*.js"
   ],
   "post_complete_commands": [
     "npm publish"

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ Generate a release for a project following semver using nodejs and gitflow
 [![Generate Release on NPM](https://img.shields.io/npm/v/generate-release.svg?style=flat-square)](https://www.npmjs.com/package/generate-release)
 [![Generate Release uses the MIT](https://img.shields.io/npm/l/generate-release.svg?style=flat-square)](https://opensource.org/licenses/MIT)
 
-Current Version: 0.7.4
+Current Version: 0.7.5
 
 Requires NodeJS v4.0.0 or greater
 
@@ -88,7 +88,6 @@ By default, the following options can be set in a `.release.json` file. The foll
 is an example with all files set.
 
       {
-          "readme_file_location": "./README.md",
           "package_file_location": "./package.json",
           "no_confirm": false,
           "skip_git_pull": false,

diff --git a/main/index.js b/main/index.js
diff --git a/main/lib/helper/gitFlowSettings.js b/main/lib/helper/gitFlowSettings.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "generate-release",
-  "version": "0.7.4",
+  "version": "0.7.5",
   "description": "Generate a release using git-glow",
   "engines": {
     "node": ">=4.0.0"