build(release): correct creation command in Makefile

Release creation with changelog and git tag, then push to
GitHub repository

Author: isokolovskii

CONTRIBUTING.md

@@ -20,4 +20,10 @@ commitizen uses [goreleaser](https://goreleaser.com) to release new versions fro
 
 Next version is defined and changelogs is generated by [git-cliff](https://git-cliff.org/docs/installation/homebrew)
 
-Commits of type fix will trigger bugfix releases, think 0.0.1 Commits of type feat will trigger feature releases, think 0.1.0 Commits with BREAKING CHANGE in body or footer will trigger breaking releases, think 1.0.0
+Commits of type fix will trigger bugfix releases, think 0.0.1\\ Commits of type feat will trigger feature releases, think 0.1.0\\ Commits with BREAKING CHANGE in body or footer will trigger breaking releases, think 1.0.0
+
+Releases are created with git tags GitHub workflow. To create git tag for next release use command from [Makefile](Makefile)
+
+```bash
+make version
+```

Makefile

@@ -39,10 +39,12 @@ version:
 		exit 1; \
 	fi
 
-	version=$$(git cliff --bumped-version)
-	echo "Bumping to version $$version"
-	sed -i '' "s/const version = .*/const version = \"$$version\"/" internal/version/version.go
-	sed -i '' "s/go install github.com\/isokolovskii\/commitizen\.*/go install github.com\/isokolovskii\/commitizen\@v$$version/" README.md
-	git add internal/version/version.go README.md
-
-	git cliff --bump
+	@version=$$(git cliff --bumped-version 2>/dev/null); \
+	echo "Bumping to version $$version"; \
+	sed -i '' "s/version = .*/version = \"$$version\"/" internal/version/version.go; \
+	sed -i '' "s/go install github.com\/isokolovskii\/commitizen@.*/go install github.com\/isokolovskii\/commitizen@$$version/" README.md; \
+	git cliff --bump -o CHANGELOG.md; \
+	git add internal/version/version.go README.md CHANGELOG.md; \
+	git commit -m "chore(release): $$version"; \
+	git tag "$$version"; \
+	git push origin $$version;

cliff.toml

@@ -8,12 +8,14 @@ body = """
 {% else %}\
     ## (unreleased)
 {% endif %}
+{% for group, commits in commits | group_by(attribute="group") %}
+### {{ group }}
 {% for commit in commits %}\
-    - {{ commit.group }}: {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message }} by {% if commit.remote.username %}[@{{commit.remote.username}}](https://github.com/{{commit.remote.username}}) {% else %}{{ commit.author.name }}{% endif %}
+    - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message }} by {% if commit.remote.username %}[@{{commit.remote.username}}](https://github.com/{{commit.remote.username}}) {% else %}{{ commit.author.name }}{% endif %}
+{% endfor %}\n
 {% endfor %}\n
 """
 trim = true
-output = "CHANGELOG.md"
 
 [git]
 conventional_commits = true
@@ -25,20 +27,21 @@ link_parsers = [
     { pattern = "RFC(\\d+)", text = "ietf-rfc$1", href = "https://datatracker.ietf.org/doc/html/rfc$1"},
 ]
 commit_parsers = [
-  { message = "^feat", group = "<!-- 0 -->:rocket: New features" },
-  { message = "^fix", group = "<!-- 1 -->:bug: Bug fixes" },
-  { message = "^docs", group = "<!-- 5 -->:books: Documentation" },
-  { message = "^perf", group = "<!-- 3 -->:zap: Performance" },
-  { message = "^refactor", group = "<!-- 4 -->:pencil: Refactor" },
-  { message = "^ci", group = "<!-- 7 -->:building_construction:ci" },
-  { message = "^test", group = "<!-- 6 -->:test_tube: Tests" },
-  { message = "^chore\\(release\\)", skip = true },
-  { message = "^chore", group = "<!-- 2 -->:screwdriver:chore" },
-  { body = ".*security", group = "<!-- 2 -->:guard: Security" },
+  { message = "^feat*", group = "<!-- 0 -->:rocket: New features" },
+  { message = "^fix*", group = "<!-- 1 -->:bug: Bug fixes" },
+  { message = "^docs*", group = "<!-- 5 -->:books: Documentation" },
+  { message = "^perf*", group = "<!-- 3 -->:zap: Performance" },
+  { message = "^refactor*", group = "<!-- 4 -->:pencil: Refactor" },
+  { message = "^ci*", group = "<!-- 7 -->:building_construction: ci" },
+  { message = "^test*", group = "<!-- 6 -->:test_tube: Tests" },
+  { message = "^chore\\(release\\)*", skip = true },
+  { message = "^chore*", group = "<!-- 2 -->:screwdriver:chore" },
+  { message = "^build*", group = "<!-- 7 -->:building_construction: ci" },
+  { body = ".*security.*", group = "<!-- 2 -->:guard: Security" },
 ]
 protect_breaking_commits = false
 filter_commits = false
-tag_pattern = "v[0-9]*"
+tag_pattern = "v[0-9]*.[0-9]*.[0-9]*"
 skip_tags = true
 ignore_tags = ""
 topo_order = false
@@ -47,7 +50,7 @@ sort_commits = "newest"
 [bump]
 features_always_bump_minor = true
 breaking_always_bump_major = true
-initial_tag = "1.0.0"
+initial_tag = "v1.0.0"
 
 [remote.github]
 owner = "isokolovskii"