]> git.donarmstrong.com Git - qmk_firmware.git/commitdiff
Always build everything on master
authorFred Sundvik <fsundvik@gmail.com>
Sun, 18 Jun 2017 14:02:19 +0000 (17:02 +0300)
committerFred Sundvik <fsundvik@gmail.com>
Sun, 18 Jun 2017 14:03:05 +0000 (17:03 +0300)
util/travis_build.sh

index c3c6f5c4335b192df91d62d7e67a73e17db8d60b..80d843bfc1fb157527814a36020fc10772f27fdb 100644 (file)
@@ -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 + $?))