diff --git a/.travis.yml b/.travis.yml index b3a1f8c..cf3b6dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -9,4 +9,4 @@ before_install: script: - $HOME/gopath/bin/goveralls -service=travis-ci - - gometalinter --deadline=5m ./... + - make lint diff --git a/Makefile b/Makefile index 14233ec..9b76d81 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ install-dev-tools: ## install dependencies and development tools gometalinter --install lint: ## lint the package - gometalinter ./... --exclude expressions/scanner.go --exclude y.go --exclude '.*_string.go' + gometalinter ./... --deadline=5m --exclude expressions/scanner.go --exclude y.go --exclude '.*_string.go' test: ## test the package go test ./... diff --git a/tags/loop.go b/tags/loop.go index 2f92287..8c861ac 100644 --- a/tags/loop.go +++ b/tags/loop.go @@ -32,7 +32,7 @@ func parseLoopExpression(source string) (expressions.Expression, error) { return expr, nil } -func loopTagParser(node chunks.ASTControlTag) (func(io.Writer, chunks.RenderContext) error, error) { +func loopTagParser(node chunks.ASTControlTag) (func(io.Writer, chunks.RenderContext) error, error) { // nolint: gocyclo expr, err := parseLoopExpression(node.Args) if err != nil { return nil, err diff --git a/tags/tags.go b/tags/tags.go index 66a99a7..3940e16 100644 --- a/tags/tags.go +++ b/tags/tags.go @@ -76,7 +76,7 @@ func caseTagParser(node chunks.ASTControlTag) (func(io.Writer, chunks.RenderCont }, nil } -func ifTagParser(polarity bool) func(chunks.ASTControlTag) (func(io.Writer, chunks.RenderContext) error, error) { +func ifTagParser(polarity bool) func(chunks.ASTControlTag) (func(io.Writer, chunks.RenderContext) error, error) { // nolint: gocyclo return func(node chunks.ASTControlTag) (func(io.Writer, chunks.RenderContext) error, error) { type branchRec struct { test expressions.Expression