Skip to content

Commit

Permalink
make lint doesn't install golinter if found one locally (#999)
Browse files Browse the repository at this point in the history
Additionally, renamed code-formatting CircleCI job to lint.
  • Loading branch information
Aleksey Dukhovniy committed Oct 25, 2019
1 parent ca57d04 commit f5d1519
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 4 deletions.
5 changes: 2 additions & 3 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- go-mod-v1-{{ checksum "go.sum" }}
- run: curl -sL https://git.io/goreleaser | bash

code-formatting:
lint:
docker:
- image: kudobuilder/golang:1.13
working_directory: /go/src/github.com/kudobuilder/kudo
Expand All @@ -41,7 +41,6 @@ jobs:
- restore_cache:
keys:
- go-mod-v1-{{ checksum "go.sum" }}

- run: make lint
- save_cache:
key: go-mod-v1-{{ checksum "go.sum" }}
Expand All @@ -52,7 +51,7 @@ workflows:
version: 2
lint:
jobs:
- code-formatting
- lint
integration-test:
jobs:
- integration-test
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ test-clean:

.PHONY: lint
lint:
go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
ifeq (, $(shell which golangci-lint))
go get github.com/golangci/golangci-lint/cmd/golangci-lint
endif
golangci-lint run

.PHONY: download
Expand Down

0 comments on commit f5d1519

Please sign in to comment.