summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-09-03 09:22:13 -0700
committerCorey Hulen <corey@hulen.com>2015-09-03 09:22:13 -0700
commit2b2ce10fede69c2f75d00817aa1061f7d6f277f9 (patch)
treeff58cb0d167c7780b6763695deeb9aa87de4b5ec /Makefile
parent246a481abc742ffb01c188ed0f5eb4cf9739e3f6 (diff)
parentb9bc1bbe10a1c0403cd708aff713ef32d8ffc55d (diff)
downloadchat-2b2ce10fede69c2f75d00817aa1061f7d6f277f9.tar.gz
chat-2b2ce10fede69c2f75d00817aa1061f7d6f277f9.tar.bz2
chat-2b2ce10fede69c2f75d00817aa1061f7d6f277f9.zip
Merge pull request #584 from mattermost/mm-1909
MM-1909 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 e1a2ae47a..d8250c07f 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 ./...
@@ -103,11 +106,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