File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed
Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -149,14 +149,14 @@ publish: dist ## package and upload a release
149149
150150.PHONY : bumpversion-release
151151bumpversion-release : # # Merge master to stable and bumpversion release
152- git checkout stable
152+ git checkout stable || git checkout -b stable
153153 git merge --no-ff master -m" make release-tag: Merge branch 'master' into stable"
154154 bumpversion release
155155 git push --tags origin stable
156156
157157.PHONY : test-bumpversion-release
158158test-bumpversion-release : # # Merge master to stable and bumpversion release
159- git checkout stable
159+ git checkout stable || git checkout -b stable
160160 git merge --no-ff master -m" make release-tag: Merge branch 'master' into stable"
161161 bumpversion release
162162
@@ -182,7 +182,7 @@ bumpversion-major: ## Bump the version the next major skipping the release
182182 bumpversion --no-tag major
183183
184184CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
185- CHANGELOG_LINES := $(shell git diff HEAD..stable HISTORY.md 2>/dev/null | wc -l)
185+ CHANGELOG_LINES := $(shell git diff HEAD..origin/ stable HISTORY.md 2>&1 | wc -l)
186186
187187.PHONY : check-release
188188check-release : # # Check if the release can be made
You can’t perform that action at this time.
0 commit comments