1 files changed, 32 insertions, 47 deletions

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 225c8548f..6d5dbed68 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -1,57 +1,42 @@
 #!/bin/bash
 
-# if docker is installed - patch calls to within the qmk docker image
-if command -v docker >/dev/null; then
-        function make() {
-                docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
-        }
+source util/travis_utils.sh
+
+NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)')
+
+if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then
+    echo "Skipping due to commit message"
+    exit 0
 fi
 
-# test force push
-#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
+if [ "$LOCAL_BRANCH" == "master" ] || [ "$NUM_CORE_CHANGES" != "0" ]; then
+    echo "Making default keymaps for all keyboards"
+    make all:default
+    exit $?
+fi
 
-TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
-TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
-MAKE_ALL="make all:default"
+exit_code=0
 
-if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
-        exit_code=0
-        git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
-        if [ $? -eq 128 ]; then
-                # We don't know what changed so just build the default keymaps
-                echo "Making default keymaps for all keyboards (fallback)"
-                eval $MAKE_ALL
+for KB in $(make list-keyboards); do
+        KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
+        if [[ -z "$KEYBOARD_CHANGES" ]]; then
+                # skip as no changes for this keyboard
+                continue
+        fi
+
+        KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/)
+        if [[ $KEYMAP_ONLY -gt 0 ]]; then
+                echo "Making all keymaps for $KB"
+                make ${KB}:all
                 : $((exit_code = $exit_code + $?))
         else
-                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)
-                BRANCH=$(git rev-parse --abbrev-ref HEAD)
-                # is this branch master or a "non docs, non keyboards" change 
-                if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
-                        echo "Making default keymaps for all keyboards"
-                        eval $MAKE_ALL
+                CHANGED_KEYMAPS=$(echo "$KEYBOARD_CHANGES" | grep -oP '(?<=keyboards/'${KB}'/keymaps/)([a-zA-Z0-9_-]+)(?=\/)')
+                for KM in $CHANGED_KEYMAPS ; do
+                        echo "Making $KM for $KB"
+                        make ${KB}:${KM}
                         : $((exit_code = $exit_code + $?))
-                else
-                        # keyboards project format
-                        #  /keyboards/board1/rev/keymaps/
-                        #  /keyboards/board2/keymaps/
-                        # ensure we strip everything off after and including the keymaps folder to get board and/or revision
-                        MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sed 's^/keymaps/.*^^' | sort -u)
-                        for KB in $MKB ; do
-                                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
-                                        : $((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}
-                                                : $((exit_code = $exit_code + $?))
-                                        done
-                                fi
-                        done
-                fi
+                done
         fi
-        exit $exit_code
-fi
+done
+
+exit $exit_code