From 04a4b9a01af6e304b0e208e914cfd2564103d975 Mon Sep 17 00:00:00 2001 From: AllyW Date: Thu, 22 Aug 2024 16:40:01 +0800 Subject: [PATCH] adjust hint --- .github/workflows/BlockPRMerge.yml | 2 +- scripts/ci/release_version_cal.py | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/BlockPRMerge.yml b/.github/workflows/BlockPRMerge.yml index e8a42d233c3..20493623f51 100644 --- a/.github/workflows/BlockPRMerge.yml +++ b/.github/workflows/BlockPRMerge.yml @@ -15,7 +15,7 @@ jobs: with: script: | const labels = context.payload.pull_request.labels.map(label => label.name); - const blockedLabels = ["do-not-merge", "needs-author-feedback", "release-version-block"]; + const blockedLabels = ["do-not-merge", "needs-author-feedback"]; if (labels.some(label => blockedLabels.includes(label))) { console.log(`It is not allowed to merge a PR with any blocked labels: ${blockedLabels}`); diff --git a/scripts/ci/release_version_cal.py b/scripts/ci/release_version_cal.py index ad346a882fd..33c582216c6 100644 --- a/scripts/ci/release_version_cal.py +++ b/scripts/ci/release_version_cal.py @@ -214,7 +214,10 @@ def get_next_version_segment_tag(): def add_suggest_header(comment_message): - comment_message.insert(0, "## :warning: Release Suggestions") + if block_pr == 1: + comment_message.insert(0, "## :warning: Release Requirements") + else: + comment_message.insert(0, "## Release Suggestions") comment_message.insert(0, "Hi @" + pr_user) @@ -232,7 +235,7 @@ def gen_version_comment_message(mod, mod_update_info, mod_message): if mod_update_info.get("version", None): bot_version = parse(mod_update_info['version']) if mod_update_info.get("version_diff", None): - diff_version = parse(mod_update_info['version_diff']) + diff_version = parse(mod_update_info['version_diff']) if diff_version != bot_version: if diff_version < bot_version: block_pr = 1