Skip to content

Commit

Permalink
adjust hint (Azure#7901)
Browse files Browse the repository at this point in the history
  • Loading branch information
AllyW authored Aug 23, 2024
1 parent fe5571a commit 919d111
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/BlockPRMerge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}`);
Expand Down
7 changes: 5 additions & 2 deletions scripts/ci/release_version_cal.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)


Expand All @@ -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
Expand Down

0 comments on commit 919d111

Please sign in to comment.