From 245b76ab51a9fe893a3bcf8fd13d1b7903ecf882 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Thu, 31 Jan 2019 15:36:56 -0800 Subject: [PATCH 1/2] Makefile: lint all travis builds Ensures we fail faster if the source code doesn't pass the lint checks. --- Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 53b7a262..26d2cc27 100644 --- a/Makefile +++ b/Makefile @@ -134,9 +134,12 @@ goveralls: $(GOVERALLS_BIN) @$(call print, "Sending coverage report.") $(GOVERALLS_BIN) -coverprofile=coverage.txt -service=travis-ci -travis-race: btcd unit-race -travis-cover: btcd lint unit-cover goveralls +travis-race: lint btcd unit-race + +travis-cover: lint btcd unit-cover goveralls + +travis-itest: lint itest # ============= # FLAKE HUNTING @@ -197,6 +200,7 @@ clean: goveralls \ travis-race \ travis-cover \ + travis-itest \ flakehunter \ flake-unit \ fmt \ From 61e5a783e886cdbabb707735f1c6f05b3d7da2a0 Mon Sep 17 00:00:00 2001 From: Conner Fromknecht Date: Thu, 31 Jan 2019 23:47:15 -0800 Subject: [PATCH 2/2] travis: use make travis-itest to perform linting --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 323b8b36..87fae3a8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ script: - 'if [ "$RACE" = true ]; then make travis-race ; fi' # Run integration tests. - - 'if [ "$ITEST" = true ]; then make itest; fi' + - 'if [ "$ITEST" = true ]; then make travis-itest; fi' # Run unit tests and generate coverage report. - 'if [ "$COVER" = true ]; then make travis-cover; fi'