From 32dd2cecc4b3ef74415d8e3532304357ffeced22 Mon Sep 17 00:00:00 2001
From: Josh Klar <j@iv597.com>
Date: Sun, 23 Sep 2018 03:12:31 -0700
Subject: [PATCH] Run the keymap tester on board builds usually

---
 .circleci/config.yml |  4 ++--
 Makefile             | 19 +++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2763f14..5b9ae03 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -56,7 +56,7 @@ jobs:
       - run: pip install pipenv==2018.7.1
       - run: apt-get update && apt-get install -y gcc-arm-none-eabi gettext wget unzip
 
-      - run: make BOARD=boards/noop.py build-pyboard
+      - run: make SKIP_KEYMAP_VALIDATION=1 USER_KEYMAP=boards/noop.py build-pyboard
 
   build_teensy_31:
     docker:
@@ -75,7 +75,7 @@ jobs:
       - run: pip install pipenv==2018.7.1
       - run: apt-get update && apt-get install -y gcc-arm-none-eabi gettext wget unzip
 
-      - run: make BOARD=boards/noop.py build-teensy-3.1
+      - run: make USER_KEYMAP=boards/noop.py build-teensy-3.1
 
 workflows:
   version: 2
diff --git a/Makefile b/Makefile
index 7f3e1dd..0fddd4e 100644
--- a/Makefile
+++ b/Makefile
@@ -143,10 +143,10 @@ circuitpy-flash-nrf-entrypoint:
 
 ifndef USER_KEYMAP
 build-feather-nrf52832:
-	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!"
+	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!" && exit 1
 
 flash-feather-nrf52832:
-	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!"
+	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!" && exit 1
 else
 build-feather-nrf52832: lint devdeps circuitpy-deps circuitpy-freeze-kmk-nrf
 	@echo "===> Preparing keyboard script for bundling into CircuitPython"
@@ -161,10 +161,10 @@ endif
 
 ifndef USER_KEYMAP
 build-teensy-3.1:
-	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!"
+	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!" && exit 1
 
 flash-teensy-3.1:
-	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!"
+	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!" && exit 1
 else
 build-teensy-3.1: lint devdeps micropython-deps micropython-freeze-kmk-teensy3.1
 	@echo "===> Preparing keyboard script for bundling into MicroPython"
@@ -179,13 +179,20 @@ endif
 
 ifndef USER_KEYMAP
 build-pyboard:
-	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!"
+	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!" && exit 1
 
 flash-pyboard:
-	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!"
+	@echo "===> Must provide a USER_KEYMAP (usually from user_keymaps/...) to build!" && exit 1
+else
+ifndef SKIP_KEYMAP_VALIDATION
+build-pyboard: lint devdeps micropython-deps micropython-freeze-kmk-stm32 micropython-build-unix
 else
 build-pyboard: lint devdeps micropython-deps micropython-freeze-kmk-stm32
+endif
 	@echo "===> Preparing keyboard script for bundling into MicroPython"
+ifndef SKIP_KEYMAP_VALIDATION
+	@MICROPYPATH=./ ./bin/micropython.sh bin/keymap_sanity_check.py ${USER_KEYMAP}
+endif
 	@cp -av ${USER_KEYMAP} vendor/micropython/ports/stm32/freeze/kmk_keyboard_user.py
 	@$(MAKE) AMPY_PORT=/dev/ttyACM0 AMPY_BAUD=115200 micropython-build-pyboard