Browse Source

pass through travis errors

Jack Humbert 8 years ago
parent
commit
de659486f5

+ 1 - 1
keyboards/handwired/onekey/keymaps/default/keymap.c

@@ -1,5 +1,5 @@
 #include "onekey.h"
 #include "onekey.h"
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    { KC_A }
+    {{ KC_A }}
 };
 };

+ 4 - 0
util/travis_build.sh

@@ -4,15 +4,19 @@ TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
 TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 
 
 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 
 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 
+	exit_code=0
 	NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
 	NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
 	if [[ $NEFM -gt 0 ]] ; then
 	if [[ $NEFM -gt 0 ]] ; then
 		echo "Making all keymaps for all keyboards"
 		echo "Making all keymaps for all keyboards"
 		make all-keyboards AUTOGEN="true"
 		make all-keyboards AUTOGEN="true"
+		: $((exit_code = $exit_code + $?))
 	else
 	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-Z_]+)' | sort -u)
 		for KB in $MKB ; do
 		for KB in $MKB ; do
 			echo "Making all keymaps for $KB"
 			echo "Making all keymaps for $KB"
 			make "$KB" AUTOGEN=true
 			make "$KB" AUTOGEN=true
+			: $((exit_code = $exit_code + $?))
 		done
 		done
 	fi
 	fi
+	exit $exit_code
 fi
 fi

+ 1 - 1
util/travis_compiled_push.sh

@@ -41,7 +41,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	#rm -rf keyboard
 	#rm -rf keyboard
 	#rm -rf keyboards
 	#rm -rf keyboards
 	yes | cp -rf ../qmk_firmware/keyboards .
 	yes | cp -rf ../qmk_firmware/keyboards .
-	mkdir keyboards/ergodox_ez/
+	#mkdir keyboards/ergodox_ez/
 	cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
 	cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
 	cp ../qmk_firmware/readme.md qmk_readme.md
 	cp ../qmk_firmware/readme.md qmk_readme.md
 	./generate.sh
 	./generate.sh