From 5acc0e54aafaff0a2f5b9a3ae6650d4ccd253d2c Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 18 Jun 2017 16:18:40 +0300
Subject: [PATCH 1/5] Make all subprojects when a keymap is modified

---
 util/travis_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

From a15510b57b39e0a12127b9297bade9b9f42332c7 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 18 Jun 2017 17:02:19 +0300
Subject: [PATCH 2/5] Always build everything on master

---
 util/travis_build.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/travis_build.sh b/util/travis_build.sh
index c3c6f5c43..80d843bfc 100644
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -6,7 +6,8 @@ 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/)'  | grep -Ev '^(docs/)' | wc -l)
-	if [[ $NEFM -gt 0 ]] ; 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"
 		: $((exit_code = $exit_code + $?))

From 6ba22b5f5eac1e7ee0b8a73fc682aed2f35c0189 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 18 Jun 2017 16:50:25 +0300
Subject: [PATCH 3/5] Don't define RGBLED_NUM in let-split khord keymap

It's already defined correctly by the parent keyboard project, and was
causing problems for rev1, where the pin is different.
---
 keyboards/lets_split/keymaps/khord/config.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/keyboards/lets_split/keymaps/khord/config.h b/keyboards/lets_split/keymaps/khord/config.h
index d6a99a8b2..2d845827b 100644
--- a/keyboards/lets_split/keymaps/khord/config.h
+++ b/keyboards/lets_split/keymaps/khord/config.h
@@ -20,9 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define USE_SERIAL
 #define EE_HANDS
 
-#undef RGBLED_NUM
 #define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 12
 
 #ifdef SUBPROJECT_rev1
     #include "../../rev1/config.h"

From 2fd670bec096aa12970aa329d841ae1338f4debe Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 18 Jun 2017 17:07:20 +0300
Subject: [PATCH 4/5] Add missing include to Ergodox Belak keymap

---
 keyboards/ergodox/keymaps/belak/keymap.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/keyboards/ergodox/keymaps/belak/keymap.c b/keyboards/ergodox/keymaps/belak/keymap.c
index d10567a78..45f63539b 100644
--- a/keyboards/ergodox/keymaps/belak/keymap.c
+++ b/keyboards/ergodox/keymaps/belak/keymap.c
@@ -2,6 +2,7 @@
 #include "debug.h"
 #include "action_layer.h"
 #include "eeconfig.h"
+#include "eeprom.h"
 
 #define LAYER_ON(pos) ((layer_state) & (1<<(pos)))
 #define _______ KC_TRNS

From 45d437ca044dd9101457aa366712b44c8b06df99 Mon Sep 17 00:00:00 2001
From: Fred Sundvik <fsundvik@gmail.com>
Date: Sun, 18 Jun 2017 18:30:59 +0300
Subject: [PATCH 5/5] Make only modified keymaps

---
 util/travis_build.sh | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 80d843bfc..3243447ab 100644
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -14,9 +14,19 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	else
 		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}-allsp-allkm AUTOGEN=true
-			: $((exit_code = $exit_code + $?))
+			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
+				: $((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
+					: $((exit_code = $exit_code + $?))
+				done		
+			fi
 		done
 	fi
 	exit $exit_code