summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
authorFred Sundvik <fsundvik@gmail.com>2017-06-18 17:02:19 +0300
committerFred Sundvik <fsundvik@gmail.com>2017-06-18 17:03:05 +0300
commita15510b57b39e0a12127b9297bade9b9f42332c7 (patch)
tree78594f4f6426acbb4fb1b5c98a6269c35bdc0be6 /util
parent5acc0e54aafaff0a2f5b9a3ae6650d4ccd253d2c (diff)
Always build everything on master
Diffstat (limited to 'util')
-rw-r--r--util/travis_build.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/util/travis_build.sh b/util/travis_build.sh
index c3c6f5c433..80d843bfc1 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 + $?))