search

nfantone / gulp-release

Enables support for git-flow style releases via gulp
MIT License
8 stars 3 forks source link

failed releasing on Windows #53

Open kuntergunt opened 5 years ago

kuntergunt commented 5 years ago

I tried to use this plugin on a windows machine and it failed with the error down there. When I manually entered "git flow release finish" the command succeeded.

nodejs: v8.11.3 git version 2.19.1.windows.1 "gulp": "^3.9.1" "gulp-release": "^1.2.0" "gulp-shell": "^0.6.3"

gulp release -t PATCH -p [12:50:38] Using gulpfile ~\Documents\WebProjects\git-flow-release\proj\gulpfile.js [12:50:38] Starting 'release'... [12:50:38] Starting 'release:start'... [12:50:38] git flow release start -F 0.1.3 Switched to a new branch 'release/0.1.3'

Summary of actions:

Follow-up actions:

[12:50:42] Finished 'release:start' after 3.56 s [12:50:42] Starting 'bump'... [12:50:42] Bumped 0.1.2 to 0.1.3 with type: patch [12:50:42] Codename is "Bronze Marklar" [12:50:42] Finished 'bump' after 49 ms [12:50:42] Starting 'release:commit'... [12:50:42] Finished 'release:commit' after 181 ms [12:50:42] Starting 'release:finish'... [12:50:42] git flow release finish -m 'Bronze Marklar' 0.1.3 C:/Program Files/Git/usr/bin/gitflow-shFlags: eval: line 890: unexpected EOF while looking for matching '' C:/Program Files/Git/usr/bin/gitflow-shFlags: eval: line 891: syntax error: unexpected end of file [12:50:50] 'release:finish' errored after 8.39 s [12:50:50] Error in plugin "gulp-shell" Message: Commandgit flow release finish -m 'Bronze Marklar' 0.1.3` failed with exit code 2 [12:50:50] [gulp-release] All done: tags and branches pushed to origin [12:50:50] Finished 'release' after 12 s

xyrus02 commented 2 years ago

I know this is a very ancient issue but it just popped up in a Google search for us, who had the same problem. We found that when the script pulled the master branch, it ran into a merge conflict which was not solveable automatically.

Ths led to that a file which is parsed by the gitflow script (I believe changelog.md) had three apostrophe characters at the beginning of a line, which is some notation of git to highlight one version of the conflicting line set.

The solution was to resolve the conflict manually, then push the branch again and repeat the release script.

I hope this helps somebody who finds this issue in Google.