From 84bd4f28545eb411835a0b60f3ec321af3257a5d Mon Sep 17 00:00:00 2001 From: Robert Kopaczewski Date: Wed, 4 Aug 2021 16:57:13 +0200 Subject: [PATCH] update changelog.mk --- tools/dev/makefiles/changelog.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/dev/makefiles/changelog.mk b/tools/dev/makefiles/changelog.mk index 6bee6fc..38096b6 100644 --- a/tools/dev/makefiles/changelog.mk +++ b/tools/dev/makefiles/changelog.mk @@ -12,6 +12,7 @@ SEMVERBOT_VERSION ?= 0.2.0 SEMVERBOT := $(DEV_BIN_PATH)/sbot_$(SEMVERBOT_VERSION) SEMVER_PREDICT_VERSION = $(shell $(SEMVERBOT) predict version) +VERSION ?= $(SEMVER_PREDICT_VERSION) .PHONY: release @@ -31,18 +32,17 @@ $(SEMVERBOT): release: $(GITCHGLOG) $(SEMVERBOT) release: ## Create new release and update changelog - echo $(SEMVER_PREDICT_VERSION) - $(GITCHGLOG) --next-tag v$(SEMVER_PREDICT_VERSION) v$(SEMVER_PREDICT_VERSION).. + $(GITCHGLOG) --next-tag v$(VERSION) v$(VERSION).. echo - echo "Releasing v$(SEMVER_PREDICT_VERSION). Continue? [y/N] " && read ans && [ $${ans:-N} = y ] + echo "Releasing v$(VERSION). Continue? [y/N] " && read ans && [ $${ans:-N} = y ] - $(GITCHGLOG) --next-tag v$(SEMVER_PREDICT_VERSION) --output CHANGELOG.md $(STARTING_VERSION).. + $(GITCHGLOG) --next-tag v$(VERSION) --output CHANGELOG.md $(STARTING_VERSION).. git add CHANGELOG.md git commit -m "changelog update" git push - $(SEMVERBOT) release version - $(SEMVERBOT) push version + git tag -a v$(VERSION) -m $(VERSION) + git push origin v$(VERSION) endif