summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-18 12:13:56 -0400
committerGitHub <noreply@github.com>2017-06-18 12:13:56 -0400
commit5682254f716dc132a2ebf64ab812fcb95d57601c (patch)
tree30e710792c27962d126432a6edc211c639249078
parent51a86b85f35769533124d209c990aee18965ea6b (diff)
parent45d437ca044dd9101457aa366712b44c8b06df99 (diff)
downloadqmk_firmware-5682254f716dc132a2ebf64ab812fcb95d57601c.tar.gz
qmk_firmware-5682254f716dc132a2ebf64ab812fcb95d57601c.zip
Merge pull request #1408 from fredizzimo/fix_build_improve_travis
Fix the two failing keymaps and improve the travis build script
-rw-r--r--keyboards/ergodox/keymaps/belak/keymap.c1
-rw-r--r--keyboards/lets_split/keymaps/khord/config.h2
-rw-r--r--util/travis_build.sh19
3 files changed, 16 insertions, 6 deletions
diff --git a/keyboards/ergodox/keymaps/belak/keymap.c b/keyboards/ergodox/keymaps/belak/keymap.c
index d10567a783..45f63539bb 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
diff --git a/keyboards/lets_split/keymaps/khord/config.h b/keyboards/lets_split/keymaps/khord/config.h
index d6a99a8b2e..2d845827ba 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"
diff --git a/util/travis_build.sh b/util/travis_build.sh
index 5b0951c6e0..3243447ab6 100644
--- a/util/travis_build.sh
+++ b/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"
- make "$KB" 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