aboutsummaryrefslogtreecommitdiff
path: root/util/travis_build.sh
diff options
context:
space:
mode:
Diffstat (limited to 'util/travis_build.sh')
-rwxr-xr-xutil/travis_build.sh7
1 files changed, 4 insertions, 3 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 605b6d5f0..2bc1ccd62 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -18,11 +18,12 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
18 exit_code=0 18 exit_code=0
19 git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} 19 git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
20 if [ $? -eq 128 ]; then 20 if [ $? -eq 128 ]; then
21 echo "Making default keymaps for all keyboards" 21 # We don't know what changed so just build the default keymaps
22 echo "Making default keymaps for all keyboards (fallback)"
22 eval $MAKE_ALL 23 eval $MAKE_ALL
23 : $((exit_code = $exit_code + $?)) 24 : $((exit_code = $exit_code + $?))
24 else 25 else
25 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) 26 NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(lib/python/)' | grep -Ev '^(bin/qmk)' | grep -Ev '^(requirements.txt)' | grep -Ev '^(util/)' | wc -l)
26 BRANCH=$(git rev-parse --abbrev-ref HEAD) 27 BRANCH=$(git rev-parse --abbrev-ref HEAD)
27 # is this branch master or a "non docs, non keyboards" change 28 # is this branch master or a "non docs, non keyboards" change
28 if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then 29 if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
@@ -56,7 +57,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
56 if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then 57 if [ $PFM -gt 0 -o "$BRANCH" = "master" ]; then
57 echo 58 echo
58 echo "Running python tests." 59 echo "Running python tests."
59 docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container bin/qmk nose2 60 docker run --rm -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container 'bin/qmk pytest'
60 : $((exit_code = $exit_code + $?)) 61 : $((exit_code = $exit_code + $?))
61 fi 62 fi
62 fi 63 fi