diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-02-07 12:36:25 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-02-07 12:36:25 -0500 |
| commit | de659486f52db6492be6ca03ce5450690f5d891d (patch) | |
| tree | d32d78772ac467b6cd02f0355822b133eeaf77d3 | |
| parent | c256ad51bd36512740906c6d43bbaa622255f9e3 (diff) | |
pass through travis errors0.5.9
| -rw-r--r-- | keyboards/handwired/onekey/keymaps/default/keymap.c | 2 | ||||
| -rw-r--r-- | util/travis_build.sh | 4 | ||||
| -rw-r--r-- | util/travis_compiled_push.sh | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/keyboards/handwired/onekey/keymaps/default/keymap.c b/keyboards/handwired/onekey/keymaps/default/keymap.c index 756c4f51ed..10c486718d 100644 --- 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 fab9178def..794b0d3a16 100644 --- 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 6ec558cac6..de2481ce54 100644 --- 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 |