X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_build.sh;h=c9b5fc3235561315a89697a961f24e5a39860675;hb=91683d56fa5c9cf9893219b3dac269e20a2c7251;hp=fab9178def7dd5b8016674dfba703edf0f3e9259;hpb=616b8604b0b0f7e281ecfeff385d96a6a14955da;p=qmk_firmware.git

diff --git a/util/travis_build.sh b/util/travis_build.sh
index fab9178de..c9b5fc323 100644
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -4,15 +4,33 @@ TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
 TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 
 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 
-	NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
-	if [[ $NEFM -gt 0 ]] ; then
+	exit_code=0
+	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-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
+			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
 fi