Skip to content

v4.0.x: git-commit-checks.py: remind people about bot:notacherrypick #8872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2021
Merged

v4.0.x: git-commit-checks.py: remind people about bot:notacherrypick #8872

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/git-commit-checks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
GOOD = "good"
BAD = "bad"

NACP = "bot:notacherrypick"

GITHUB_WORKSPACE = os.environ.get('GITHUB_WORKSPACE')
GITHUB_SHA = os.environ.get('GITHUB_SHA')
GITHUB_BASE_REF = os.environ.get('GITHUB_BASE_REF')
Expand Down Expand Up @@ -218,7 +220,7 @@ def _is_entirely_submodule_updates(repo, commit):

else:
if config['cherry pick required']:
return BAD, "does not include a cherry pick message"
return BAD, f"does not include a cherry pick message (did you need to {NACP}?)"
else:
return GOOD, None

Expand Down Expand Up @@ -284,7 +286,7 @@ def check_github_pr_description(config):
pr_num = int(match.group(1))
pr = repo.get_pull(pr_num)

if "bot:notacherrypick" in pr.body:
if NACP in pr.body:
config['cherry pick required'] = False

#----------------------------------------------------------------------------
Expand Down