summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-17 09:21:56 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-17 09:21:56 -0700
commit9b5198c69c01ff11b0977282b61cf2222ef2f2b1 (patch)
treea5179226ff013f082a6629dbf888454c53611383 /Makefile
parent51c3445e694e68fdecd809f17fbaa64751e5931c (diff)
parent3edd8dbdf65e0b7be422a46328cb85482aa78f69 (diff)
downloadchat-9b5198c69c01ff11b0977282b61cf2222ef2f2b1.tar.gz
chat-9b5198c69c01ff11b0977282b61cf2222ef2f2b1.tar.bz2
chat-9b5198c69c01ff11b0977282b61cf2222ef2f2b1.zip
Merge branch 'master' into PLT-92
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile18
1 files changed, 18 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index cf8410ef1..1e3ffa41c 100644
--- a/Makefile
+++ b/Makefile
@@ -40,6 +40,15 @@ travis:
@echo Checking for style guide compliance
cd web/react && $(ESLINT) --quiet components/* dispatcher/* pages/* stores/* utils/*
+ @echo Running gofmt
+ $(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
+ @echo "$(GOFMT_OUTPUT)"
+ @if [ ! "$(GOFMT_OUTPUT)" ]; then \
+ echo "gofmt sucess"; \
+ else \
+ echo "gofmt failure"; \
+ exit 1; \
+ fi
@sed -i'.bak' 's|_BUILD_NUMBER_|$(BUILD_NUMBER)|g' ./model/version.go
@sed -i'.bak' 's|_BUILD_DATE_|$(BUILD_DATE)|g' ./model/version.go
@@ -112,6 +121,15 @@ install:
check: install
@echo Running ESLint...
-cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
+ @echo Running gofmt
+ $(eval GOFMT_OUTPUT := $(shell gofmt -d -s api/ model/ store/ utils/ manualtesting/ mattermost.go 2>&1))
+ @echo "$(GOFMT_OUTPUT)"
+ @if [[ ! "$(GOFMT_OUTPUT)" ]]; then \
+ echo "gofmt sucess"; \
+ else \
+ echo "gofmt failure"; \
+ exit 1; \
+ fi
test: install
@mkdir -p logs