convert to unix line-endings [skip ci]

[qmk_firmware.git] / util / travis_build.sh

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 2d43f3e5e99897afd3e8e68e4774efaf7d83ac6c..c9b5fc3235561315a89697a961f24e5a39860675 100644 (file)
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -5,17 +5,31 @@ 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
+       NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)'  | grep -Ev '^(docs/)' | wc -l)
+       BRANCH=$(git rev-parse --abbrev-ref HEAD)
+       if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
                echo "Making all keymaps for all keyboards"
-               make all-keyboards AUTOGEN="true"
+               make all:default AUTOGEN="true"
                : $((exit_code = $exit_code + $?))
        else
-               MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)' | 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 + $?))
+                       if [[ $KB == *keymaps* ]]; then
+                               continue
+                       fi
+                       KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l)
+                       if [[ $KEYMAP_ONLY -gt 0 ]]; then
+                               echo "Making all keymaps for $KB"
+                               make ${KB}:all AUTOGEN=true
+                               : $((exit_code = $exit_code + $?))
+                       else
+                               MKM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_]+)(?=\/)' | sort -u)
+                               for KM in $MKM ; do
+                                       echo "Making $KM for $KB"       
+                                       make ${KB}:${KM} AUTOGEN=true
+                                       : $((exit_code = $exit_code + $?))
+                               done            
+                       fi
                done
        fi
        exit $exit_code