From 45a20ae5c6446d1cd226654c7e17c87165519e84 Mon Sep 17 00:00:00 2001
From: Roman <56846628+RomanBredehoft@users.noreply.github.com>
Date: Thu, 29 Jun 2023 16:51:48 +0200
Subject: [PATCH] chore: fix make release

---
 Makefile | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index 8af2e76bf..967830d24 100644
--- a/Makefile
+++ b/Makefile
@@ -540,20 +540,22 @@ changelog: check_version_coherence
 	PROJECT_VER="$${PROJECT_VER[1]}" && \
 	poetry run python ./script/make_utils/changelog_helper.py > "CHANGELOG_$${PROJECT_VER}.md"
 
-.PHONY: release_no_push # Create a new release without pushing the tag
-release_no_push: check_version_coherence check_apidocs
+.PHONY: release # Create a new release from the private repo
+release: check_version_coherence check_apidocs
 	@PROJECT_VER=($$(poetry version)) && \
 	PROJECT_VER="$${PROJECT_VER[1]}" && \
 	TAG_NAME="v$${PROJECT_VER}" && \
 	git fetch --tags --force && \
-	git tag -s -a -m "$${TAG_NAME} release" "$${TAG_NAME}"
-
-.PHONY: release # Create a new release from the private repo
-release: release_no_push
+	git tag -s -a -m "$${TAG_NAME} release" "$${TAG_NAME}" && \
 	git push origin "refs/tags/$${TAG_NAME}"
 
-.PHONY: release # Create a new release from the public repo
-public_release: release_no_push
+.PHONY: public_release # Create a new release from the public repo
+public_release: check_version_coherence check_apidocs
+	@PROJECT_VER=($$(poetry version)) && \
+	PROJECT_VER="$${PROJECT_VER[1]}" && \
+	TAG_NAME="v$${PROJECT_VER}" && \
+	git fetch --tags --force && \
+	git tag -s -a -m "$${TAG_NAME} release" "$${TAG_NAME}" && \
 	git push public "refs/tags/$${TAG_NAME}"
 
 .PHONY: show_scope # Show the accepted types and optional scopes (for git conventional commits)