From 465986ae6938c87c155dd2bc55907ce84b109bd5 Mon Sep 17 00:00:00 2001 From: Ning Yu Date: Fri, 29 Mar 2024 16:26:43 +0800 Subject: [PATCH] chore(release): tag in the main branch manually rather than the PR branch Signed-off-by: Ning Yu --- automq_release.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/automq_release.py b/automq_release.py index 1d89434201..862bf611f0 100644 --- a/automq_release.py +++ b/automq_release.py @@ -149,8 +149,9 @@ def do_release(tag, s3stream_tag): cmd("Committing changes", ["git", "commit", "--all", "--gpg-sign", "--signoff", "--message", f"ci: bump version to {tag}"]) cmd("Pushing changes", ["git", "push", "--quiet", "origin", new_branch]) - cmd("Tagging %s" % tag, ["git", "tag", "--sign", "--annotate", tag, "--message", f"release {tag}"]) - cmd("Pushing tag %s" % tag, ["git", "push", "--quiet", "origin", tag]) + # TODO: tag it in the main branch rather than in the PR branch + # cmd("Tagging %s" % tag, ["git", "tag", "--sign", "--annotate", tag, "--message", f"release {tag}"]) + # cmd("Pushing tag %s" % tag, ["git", "push", "--quiet", "origin", tag]) return new_branch @@ -197,3 +198,8 @@ def check_before_started(tag, s3stream_tag): print(f"=== release {tag} done ===") print(f"Please create a PR to merge release branch to {main_branch} visiting:") print(f" https://github.com/AutoMQ/automq-for-kafka/pull/new/{main_branch}...{branch}") + print(f"After the PR is merged, please tag it:") + print(f" git checkout {main_branch}") + print(f" git pull") + print(f" git tag --sign --annotate {tag} --message 'release {tag}'") + print(f" git push origin {tag}")