Merge remote-tracking branch 'qmk/master'

[qmk_firmware.git] / util / travis_build.sh

diff --git a/util/travis_build.sh b/util/travis_build.sh
index fab9178def7dd5b8016674dfba703edf0f3e9259..6bafd1941f0a620dc786bfdb376017a22b6834d9 100644 (file)
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -4,15 +4,19 @@ TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
 TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 
 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 
+       exit_code=0
        NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
        if [[ $NEFM -gt 0 ]] ; then
                echo "Making all keymaps for all keyboards"
                make all-keyboards AUTOGEN="true"
+               : $((exit_code = $exit_code + $?))
        else
-               MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u)
+               MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)(?=\/)' | sort -u)
                for KB in $MKB ; do
                        echo "Making all keymaps for $KB"
                        make "$KB" AUTOGEN=true
+                       : $((exit_code = $exit_code + $?))
                done
        fi
+       exit $exit_code
 fi