alvierahman90/qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1408 from fredizzimo/fix_build_improve_travis

Browse Source 
Fix the two failing keymaps and improve the travis build script
This commit is contained in:
Jack Humbert 2017-06-18 12:13:56 -04:00 committed by GitHub
commit 5682254f71
3 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
keyboards/ergodox/keymaps/belak/keymap.c
View File

@ -2,6 +2,7 @@
#include "debug.h" #include "debug.h"
#include "action_layer.h" #include "action_layer.h"
#include "eeconfig.h" #include "eeconfig.h"
#include "eeprom.h"
#define LAYER_ON(pos) ((layer_state) & (1<<(pos))) #define LAYER_ON(pos) ((layer_state) & (1<<(pos)))
#define _______ KC_TRNS #define _______ KC_TRNS

2
keyboards/lets_split/keymaps/khord/config.h
View File

@ -20,9 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define USE_SERIAL #define USE_SERIAL
#define EE_HANDS #define EE_HANDS
#undef RGBLED_NUM
#define RGBLIGHT_ANIMATIONS #define RGBLIGHT_ANIMATIONS
#define RGBLED_NUM 12
#ifdef SUBPROJECT_rev1 #ifdef SUBPROJECT_rev1
#include "../../rev1/config.h" #include "../../rev1/config.h"

19
util/travis_build.sh
View File

@ -6,16 +6,27 @@ 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 exit_code=0
NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) 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" echo "Making all keymaps for all keyboards"
make all-keyboards AUTOGEN="true" make all-keyboards AUTOGEN="true"
: $((exit_code = $exit_code + $?)) : $((exit_code = $exit_code + $?))
else else
MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)(?=\/)' | sort -u) MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_]+)(?=\/)' | sort -u)
for KB in $MKB ; do 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 done
fi fi
exit $exit_code exit $exit_code