Update docker util script and travis to use new base container

[qmk_firmware.git] / util / travis_build.sh

diff --git a/util/travis_build.sh b/util/travis_build.sh
old mode 100644 (file)
new mode 100755 (executable)
index df2e069..fd5511a
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -1,18 +1,56 @@
 #!/bin/bash
 
+# if docker is installed - call make within the qmk docker image
+if command -v docker >/dev/null; then
+  function make() {
+    docker run --rm -e MAKEFLAGS="$MAKEFLAGS" -w /qmk_firmware/ -v "$PWD":/qmk_firmware --user $(id -u):$(id -g) qmkfm/base_container make "$@"
+  }
+fi
+
+# test force push
+#TRAVIS_COMMIT_RANGE="c287f1bfc5c8...81f62atc4c1d"
+
 TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
 TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
+MAKE_ALL="make all:default"
 
-if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then 
-       NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l)
-       if [[ $NEFM -gt 0 ]] ; then
-               echo "Making all keymaps for all keyboards"
-               make all-keyboards AUTOGEN=true
+if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
+       exit_code=0
+       git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
+       if [ $? -eq 128 ]; then
+               echo "Making default keymaps for all keyboards"
+               eval $MAKE_ALL
+               : $((exit_code = $exit_code + $?))
        else
-               MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z_]+)' | sort -u)
-               for KB in $MKB ; do
-                       echo "Making all keymaps for $KB"
-                       make "$KB" AUTOGEN=true
-               done
+               NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)'  | grep -Ev '^(docs/)' | wc -l)
+               BRANCH=$(git rev-parse --abbrev-ref HEAD)
+               # is this branch master or a "non docs, non keyboards" change 
+               if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
+                       echo "Making default keymaps for all keyboards"
+                       eval $MAKE_ALL
+                       : $((exit_code = $exit_code + $?))
+               else
+                   # keyboards project format
+                       #  /keyboards/board1/rev/keymaps/
+                       #  /keyboards/board2/keymaps/
+                       # ensure we strip everything off after and including the keymaps folder to get board and/or revision
+                       MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sed 's^/keymaps/.*^^' | sort -u)
+                       for KB in $MKB ; do
+                               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}:all
+                                       : $((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}:${KM}
+                                               : $((exit_code = $exit_code + $?))
+                                       done
+                               fi
+                       done
+               fi
        fi
+       exit $exit_code
 fi