From eed418ea330d2c949ace80ddca95a75ac02d89d6 Mon Sep 17 00:00:00 2001 From: yparitcher Date: Sun, 6 Jan 2019 20:42:50 -0500 Subject: [PATCH] add black to travis build --- Makefile | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 47461c6..ffdb36a 100644 --- a/Makefile +++ b/Makefile @@ -33,7 +33,7 @@ CFLAGS += -DAES256=1 -DAPP_CONFIG=\"app.h\" name = main -.PHONY: all $(LIBCBOR) +.PHONY: all $(LIBCBOR) env2 env3 black wink2 wink3 fido2-test clean full-clean travis all: main tinycbor/Makefile crypto/tiny-AES-c/aes.c: @@ -49,7 +49,7 @@ test: env3 $(MAKE) clean $(MAKE) -C . main $(MAKE) clean - cd ./targets/stm32l432; $(MAKE) test PREFIX=$(PREFIX) VENV=". ../../env3/bin/activate;" + cd ./targets/stm32l432; $(MAKE) test PREFIX=$(PREFIX) VENV=$(VENV) $(MAKE) clean $(MAKE) cppcheck @@ -86,7 +86,7 @@ env3: # selectively reformat our own code black: env3 - env3/bin/black --skip-string-normalization tools/ + env3/bin/black --skip-string-normalization --check tools/ wink2: env2 env2/bin/python tools/solotool.py solo --wink @@ -115,3 +115,7 @@ clean: full-clean: clean rm -rf env2 env3 + +travis: + $(MAKE) test VENV=". ../../env3/bin/activate;" + $(MAKE) black