qwerty_code_friendly: configurable left thumb

[qmk_firmware.git] / util / travis_build.sh

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 3243447ab62079e0d527715cbc8c4f527919ca4e..c9b5fc3235561315a89697a961f24e5a39860675 100644 (file)
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -9,21 +9,24 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
        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
+                       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}-allsp-allkm AUTOGEN=true
+                               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}-allsp-${KM} AUTOGEN=true
+                                       make ${KB}:${KM} AUTOGEN=true
                                        : $((exit_code = $exit_code + $?))
                                done            
                        fi