pass through travis errors

diff --git a/keyboards/handwired/onekey/keymaps/default/keymap.c b/keyboards/handwired/onekey/keymaps/default/keymap.c
index 756c4f51edf9ce25e6d67e46386567e902052e7c..10c486718d5f434f2b2184e6b8b937e8e3bd977c 100644 (file)
--- a/keyboards/handwired/onekey/keymaps/default/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 #include "onekey.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    { KC_A }
+    {{ KC_A }}
 };

diff --git a/util/travis_build.sh b/util/travis_build.sh
index fab9178def7dd5b8016674dfba703edf0f3e9259..794b0d3a165ceeb92009454fcb58f58282769af4 100644 (file)
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -4,15 +4,19 @@ TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
 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/)' | wc -l)
        if [[ $NEFM -gt 0 ]] ; 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-Z_]+)' | sort -u)
                for KB in $MKB ; do
                        echo "Making all keymaps for $KB"
                        make "$KB" AUTOGEN=true
+                       : $((exit_code = $exit_code + $?))
                done
        fi
+       exit $exit_code
 fi

diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh
index 6ec558cac649b532a3e832776031fea095ffe541..de2481ce54625f3867c7882ec42005c03747ab5d 100644 (file)
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -41,7 +41,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
        #rm -rf keyboard
        #rm -rf 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/readme.md qmk_readme.md
        ./generate.sh