filter python from the list of things that trigger default builds
This commit is contained in:
parent
1013ae2d34
commit
18690ddaea
1 changed files with 2 additions and 2 deletions
|
@ -22,7 +22,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
|
||||||
eval $MAKE_ALL
|
eval $MAKE_ALL
|
||||||
: $((exit_code = $exit_code + $?))
|
: $((exit_code = $exit_code + $?))
|
||||||
else
|
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)
|
BRANCH=$(git rev-parse --abbrev-ref HEAD)
|
||||||
# is this branch master or a "non docs, non keyboards" change
|
# is this branch master or a "non docs, non keyboards" change
|
||||||
if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
|
if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
|
||||||
|
@ -52,7 +52,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
|
||||||
done
|
done
|
||||||
fi
|
fi
|
||||||
# Check and run python tests if necessary
|
# 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
|
if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
|
||||||
echo
|
echo
|
||||||
echo "Running python tests."
|
echo "Running python tests."
|
||||||
|
|
Loading…
Reference in a new issue