Skip to content

Commit 3d86df0

Browse files
committed
tools: Allow check-cherry-picks.sh to be disabled by an env var
The checks performed by this script aren't always useful to downstream consumers of the repo so allow them to disable the script without having to make changes to tox.ini. NOTE(lyarwood): This backport has Ie8a672fd21184c810bfe9c0e3a49582189bf2111 squashed into it to ensure the introduced env var is passed into the pep8 tox env. tox: Add passenv DISABLE_CHERRY_PICK_CHECK to pep8 I4f551dc4b57905cab8aa005c5680223ad1b57639 introduced the environment variable to disable the check-cherry-pick.sh script but forgot to allow it to be passed into the pep8 tox env. Change-Id: I4f551dc4b57905cab8aa005c5680223ad1b57639 (cherry picked from commit 610396f)
1 parent 8fab5fc commit 3d86df0

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

tools/check-cherry-picks.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@
44
# to verify that they're all on either master or stable/ branches
55
#
66

7+
# Allow this script to be disabled by a simple env var
8+
if [ ${DISABLE_CHERRY_PICK_CHECK:-0} -eq 1 ]; then
9+
exit 0
10+
fi
11+
712
commit_hash=""
813

914
# Check if the patch is a merge patch by counting the number of parents.

tox.ini

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,8 @@ commands =
4949
description =
5050
Run style checks.
5151
envdir = {toxworkdir}/shared
52+
passenv =
53+
DISABLE_CHERRY_PICK_CHECK
5254
commands =
5355
{[testenv:mypy]commands}
5456
bash tools/flake8wrap.sh {posargs}

0 commit comments

Comments
 (0)