summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorskullY <skullydazed@gmail.com>2019-08-29 12:31:16 -0700
committerskullydazed <skullydazed@users.noreply.github.com>2019-09-07 07:58:41 -0700
commit18690ddaeaa66de91bcd635fb2eeee4364e1d162 (patch)
treeb72e7691546d465030069762f039f1dc32b4bc84 /util
parent1013ae2d34dc34e0e7d63fe875e70801ded3673c (diff)
downloadqmk_firmware-18690ddaeaa66de91bcd635fb2eeee4364e1d162.tar.gz
qmk_firmware-18690ddaeaa66de91bcd635fb2eeee4364e1d162.zip
filter python from the list of things that trigger default builds
Diffstat (limited to 'util')
-rwxr-xr-xutil/travis_build.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 3fff768f6f..81546c1156 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -22,7 +22,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
eval $MAKE_ALL
: $((exit_code = $exit_code + $?))
else
- NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l)
+ NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(lib/python/)' | grep -Ev (^bin/qmk) | wc -l)
BRANCH=$(git rev-parse --abbrev-ref HEAD)
# is this branch master or a "non docs, non keyboards" change
if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
@@ -52,7 +52,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
done
fi
# Check and run python tests if necessary
- PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E '^(lib/python/)' | wc -l)
+ PFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -E -e '^(lib/python/)' -e '^(bin/qmk)' | wc -l)
if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
echo
echo "Running python tests."