summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorChristopher Speller <crspeller@gmail.com>2015-09-03 08:49:58 -0400
committerChristopher Speller <crspeller@gmail.com>2015-09-03 08:53:22 -0400
commitb9bc1bbe10a1c0403cd708aff713ef32d8ffc55d (patch)
treeef8f6e1dcf715abed0185ef7e2e232c25ad87dd5 /Makefile
parentfb75b264093437fff996c20cd918a16f2b8cd82d (diff)
downloadchat-b9bc1bbe10a1c0403cd708aff713ef32d8ffc55d.tar.gz
chat-b9bc1bbe10a1c0403cd708aff713ef32d8ffc55d.tar.bz2
chat-b9bc1bbe10a1c0403cd708aff713ef32d8ffc55d.zip
Enabling checking of style guide on travis and turning on strict mode
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 5 insertions, 6 deletions
diff --git a/Makefile b/Makefile
index 915eb4cea..501e148cb 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ GOFLAGS ?= $(GOFLAGS:)
BUILD_NUMBER ?= $(BUILD_NUMBER:)
GO=$(GOPATH)/bin/godep go
-ESLINT=web/react/node_modules/eslint/bin/eslint.js
+ESLINT=node_modules/eslint/bin/eslint.js
ifeq ($(BUILD_NUMBER),)
BUILD_NUMBER := dev
@@ -37,6 +37,9 @@ travis:
@cd web/react/ && npm install
+ @echo Checking for style guide compliance
+ cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
+
@$(GO) build $(GOFLAGS) ./...
@$(GO) install $(GOFLAGS) -a ./...
@@ -105,11 +108,7 @@ install:
check: install
@echo Running ESLint...
- @$(ESLINT) web/react/components/*
- @$(ESLINT) web/react/dispatcher/*
- @$(ESLINT) web/react/pages/*
- @$(ESLINT) web/react/stores/*
- @$(ESLINT) web/react/utils/*
+ -cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
test: install
@mkdir -p logs