X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=util%2Ftravis_build.sh;fp=util%2Ftravis_build.sh;h=80d843bfc1fb157527814a36020fc10772f27fdb;hb=a15510b57b39e0a12127b9297bade9b9f42332c7;hp=c3c6f5c4335b192df91d62d7e67a73e17db8d60b;hpb=5acc0e54aafaff0a2f5b9a3ae6650d4ccd253d2c;p=qmk_firmware.git diff --git a/util/travis_build.sh b/util/travis_build.sh index c3c6f5c43..80d843bfc 100644 --- a/util/travis_build.sh +++ b/util/travis_build.sh @@ -6,7 +6,8 @@ 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 + $?))