From edf339623825e442cdad411cc5edb565e4a8b09f Mon Sep 17 00:00:00 2001 From: Volker Schukai <volker.schukai@schukai.com> Date: Mon, 31 Oct 2022 12:27:24 +0100 Subject: [PATCH] fix tag version --- development/makefiles/target-npm-publish.mk | 6 +++--- development/makefiles/target-version.mk | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/development/makefiles/target-npm-publish.mk b/development/makefiles/target-npm-publish.mk index d2c19e720..d7f8b391e 100644 --- a/development/makefiles/target-npm-publish.mk +++ b/development/makefiles/target-npm-publish.mk @@ -10,7 +10,7 @@ ## release major version of package npm-publish-major: $(ECHOMARKER) "release major version" - $(QUIET) $(MAKE) next-major-version + $(QUIET) $(MAKE) tag-major-version $(QUIET) $(MAKE) node-build $(QUIET) $(MAKE) node-test $(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish @@ -19,7 +19,7 @@ npm-publish-major: ## release minor version of package npm-publish-minor: $(ECHOMARKER) "release minor version" - $(QUIET) $(MAKE) next-minor-version + $(QUIET) $(MAKE) tag-minor-version $(QUIET) $(MAKE) node-build $(QUIET) $(MAKE) node-test $(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish @@ -28,7 +28,7 @@ npm-publish-minor: ## release patch version of package npm-publish-patch: $(ECHOMARKER) "release patch version" - $(QUIET) $(MAKE) next-patch-version + $(QUIET) $(MAKE) tag-patch-version $(QUIET) $(MAKE) node-build $(QUIET) $(MAKE) node-test $(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish diff --git a/development/makefiles/target-version.mk b/development/makefiles/target-version.mk index b68287b45..71c274d58 100644 --- a/development/makefiles/target-version.mk +++ b/development/makefiles/target-version.mk @@ -55,7 +55,7 @@ tag-patch-version: $(GIT_CHGLOG_CONFIG_DIR)/config.yml $(GIT_CHGLOG_CONFIG_DIR)/ $(QUIET) $(GIT) tag -a v$(PROJECT_VERSION) -m "Version $(PROJECT_VERSION)" ## tag repository with next minor version -tag-minor-version: $(GIT_CHGLOG_CONFIG_DIR)/config.yml $(GIT_CHGLOG_CONFIG_DIR)/CHANGELOG.tpl.md next-patch-version next-minor-version +tag-minor-version: $(GIT_CHGLOG_CONFIG_DIR)/config.yml $(GIT_CHGLOG_CONFIG_DIR)/CHANGELOG.tpl.md next-minor-version $(ECHOMARKER) "Tagging minor version" $(eval PROJECT_VERSION := $(shell cat $(RELEASE_FILE) | jq -r .version)) $(GIT_CHGLOG_BIN) --next-tag v$(PROJECT_VERSION) -o $(CHANGELOG_FILE) @@ -63,7 +63,7 @@ tag-minor-version: $(GIT_CHGLOG_CONFIG_DIR)/config.yml $(GIT_CHGLOG_CONFIG_DIR)/ $(QUIET) $(GIT) tag -a v$(PROJECT_VERSION) -m "Version $(PROJECT_VERSION)" ## tag repository with next major version -tag-major-version: $(GIT_CHGLOG_CONFIG_DIR)/config.yml $(GIT_CHGLOG_CONFIG_DIR)/CHANGELOG.tpl.md next-patch-version next-major-version +tag-major-version: $(GIT_CHGLOG_CONFIG_DIR)/config.yml $(GIT_CHGLOG_CONFIG_DIR)/CHANGELOG.tpl.md next-major-version $(ECHOMARKER) "Tagging major version" $(eval PROJECT_VERSION := $(shell cat $(RELEASE_FILE) | jq -r .version)) $(GIT_CHGLOG_BIN) --next-tag v$(PROJECT_VERSION) -o $(CHANGELOG_FILE) -- GitLab