Skip to content

Commit 919d111

Browse files
authored
adjust hint (Azure#7901)
1 parent fe5571a commit 919d111

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

.github/workflows/BlockPRMerge.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
with:
1616
script: |
1717
const labels = context.payload.pull_request.labels.map(label => label.name);
18-
const blockedLabels = ["do-not-merge", "needs-author-feedback", "release-version-block"];
18+
const blockedLabels = ["do-not-merge", "needs-author-feedback"];
1919
2020
if (labels.some(label => blockedLabels.includes(label))) {
2121
console.log(`It is not allowed to merge a PR with any blocked labels: ${blockedLabels}`);

scripts/ci/release_version_cal.py

+5-2
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,10 @@ def get_next_version_segment_tag():
214214

215215

216216
def add_suggest_header(comment_message):
217-
comment_message.insert(0, "## :warning: Release Suggestions")
217+
if block_pr == 1:
218+
comment_message.insert(0, "## :warning: Release Requirements")
219+
else:
220+
comment_message.insert(0, "## Release Suggestions")
218221
comment_message.insert(0, "Hi @" + pr_user)
219222

220223

@@ -232,7 +235,7 @@ def gen_version_comment_message(mod, mod_update_info, mod_message):
232235
if mod_update_info.get("version", None):
233236
bot_version = parse(mod_update_info['version'])
234237
if mod_update_info.get("version_diff", None):
235-
diff_version = parse(mod_update_info['version_diff'])
238+
diff_version = parse(mod_update_info['version_diff'])
236239
if diff_version != bot_version:
237240
if diff_version < bot_version:
238241
block_pr = 1

0 commit comments

Comments
 (0)