From 524e2b948743e9f17d203b7741d3e09bcb5e8bd9 Mon Sep 17 00:00:00 2001
From: Drashna Jaelre <drashna@live.com>
Date: Fri, 31 May 2019 15:07:52 -0700
Subject: Fix up scripts for ZSA repo

---
 util/travis_build.sh | 41 ++++-------------------------------------
 1 file changed, 4 insertions(+), 37 deletions(-)

(limited to 'util/travis_build.sh')

diff --git a/util/travis_build.sh b/util/travis_build.sh
index 554ec8b689..ed80d52f56 100755
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -12,45 +12,12 @@ fi
 
 TRAVIS_COMMIT_MESSAGE="${TRAVIS_COMMIT_MESSAGE:-none}"
 TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
-MAKE_ALL="make all:default"
+MAKE_ALL="make all:all"
 
 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
-		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
+  echo "Making all keymaps for all of the ZSA keyboards"
+  eval $MAKE_ALL
+  : $((exit_code = $exit_code + $?))
 	exit $exit_code
 fi
-- 
cgit v1.2.3