From e5ef95815e98721c503638d912876a4eb047677f Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Tue, 27 Apr 2021 09:08:25 -0700
Subject: [PATCH] git-commit-checks.py: remind people about bot:notacherrypick
Signed-off-by: Jeff Squyres <jsquyres@cisco.com>
---
.github/workflows/git-commit-checks.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/git-commit-checks.py b/.github/workflows/git-commit-checks.py
index d6ebfbfd1d..9f212328f2 100755
--- a/.github/workflows/git-commit-checks.py
+++ b/.github/workflows/git-commit-checks.py
@@ -50,6 +50,8 @@ from github import Github
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')
@@ -218,7 +220,7 @@ def check_cherry_pick(config, 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
@@ -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
#----------------------------------------------------------------------------
--
GitLab