Merge pull request #1408 from fredizzimo/fix_build_improve_travis

Fix the two failing keymaps and improve the travis build script

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

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"

util/travis_build.sh

@@ -6,16 +6,27 @@ 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 + $?))
 	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"
+			KEYMAP_ONLY=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/'${KB}'/keymaps/)' | wc -l)
-			make "$KB" AUTOGEN=true
+			if [[ $KEYMAP_ONLY -gt 0 ]]; then
-			: $((exit_code = $exit_code + $?))
+				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