Skip to content
Snippets Groups Projects
Verified Commit edf33962 authored by Volker Schukai's avatar Volker Schukai :alien:
Browse files

fix tag version

parent e8dde87d
No related branches found
No related tags found
No related merge requests found
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
## release major version of package ## release major version of package
npm-publish-major: npm-publish-major:
$(ECHOMARKER) "release major version" $(ECHOMARKER) "release major version"
$(QUIET) $(MAKE) next-major-version $(QUIET) $(MAKE) tag-major-version
$(QUIET) $(MAKE) node-build $(QUIET) $(MAKE) node-build
$(QUIET) $(MAKE) node-test $(QUIET) $(MAKE) node-test
$(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish $(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish
...@@ -19,7 +19,7 @@ npm-publish-major: ...@@ -19,7 +19,7 @@ npm-publish-major:
## release minor version of package ## release minor version of package
npm-publish-minor: npm-publish-minor:
$(ECHOMARKER) "release minor version" $(ECHOMARKER) "release minor version"
$(QUIET) $(MAKE) next-minor-version $(QUIET) $(MAKE) tag-minor-version
$(QUIET) $(MAKE) node-build $(QUIET) $(MAKE) node-build
$(QUIET) $(MAKE) node-test $(QUIET) $(MAKE) node-test
$(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish $(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish
...@@ -28,7 +28,7 @@ npm-publish-minor: ...@@ -28,7 +28,7 @@ npm-publish-minor:
## release patch version of package ## release patch version of package
npm-publish-patch: npm-publish-patch:
$(ECHOMARKER) "release patch version" $(ECHOMARKER) "release patch version"
$(QUIET) $(MAKE) next-patch-version $(QUIET) $(MAKE) tag-patch-version
$(QUIET) $(MAKE) node-build $(QUIET) $(MAKE) node-build
$(QUIET) $(MAKE) node-test $(QUIET) $(MAKE) node-test
$(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish $(QUIET) $(NPM) --prefix $(NODE_ROOT_DIR) run publish
......
...@@ -55,7 +55,7 @@ tag-patch-version: $(GIT_CHGLOG_CONFIG_DIR)/config.yml $(GIT_CHGLOG_CONFIG_DIR)/ ...@@ -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)" $(QUIET) $(GIT) tag -a v$(PROJECT_VERSION) -m "Version $(PROJECT_VERSION)"
## tag repository with next minor 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" $(ECHOMARKER) "Tagging minor version"
$(eval PROJECT_VERSION := $(shell cat $(RELEASE_FILE) | jq -r .version)) $(eval PROJECT_VERSION := $(shell cat $(RELEASE_FILE) | jq -r .version))
$(GIT_CHGLOG_BIN) --next-tag v$(PROJECT_VERSION) -o $(CHANGELOG_FILE) $(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)/ ...@@ -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)" $(QUIET) $(GIT) tag -a v$(PROJECT_VERSION) -m "Version $(PROJECT_VERSION)"
## tag repository with next major 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" $(ECHOMARKER) "Tagging major version"
$(eval PROJECT_VERSION := $(shell cat $(RELEASE_FILE) | jq -r .version)) $(eval PROJECT_VERSION := $(shell cat $(RELEASE_FILE) | jq -r .version))
$(GIT_CHGLOG_BIN) --next-tag v$(PROJECT_VERSION) -o $(CHANGELOG_FILE) $(GIT_CHGLOG_BIN) --next-tag v$(PROJECT_VERSION) -o $(CHANGELOG_FILE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment