Skip to content

Commit 099a6cf

Browse files
🌱 (cleanup): Remove 'make vet' from Makefile, simplify; keep 'vet' enabled in linting (#1718)
* Remove 'make vet' from Makefile, simplify; keep 'vet' enabled in linting * Apply suggestions from code review
1 parent bf13d14 commit 099a6cf

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed

‎.golangci.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ linters:
2323
- errorlint
2424
- gci
2525
- gofmt
26+
- govet
2627
- gosec
2728
- importas
2829
- misspell

‎Makefile

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyI
117117
$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
118118

119119
.PHONY: verify
120-
verify: tidy fmt vet generate manifests crd-ref-docs #HELP Verify all generated code is up-to-date.
120+
verify: tidy fmt generate manifests crd-ref-docs #HELP Verify all generated code is up-to-date.
121121
git diff --exit-code
122122

123123
.PHONY: fix-lint
@@ -128,10 +128,6 @@ fix-lint: $(GOLANGCI_LINT) #EXHELP Fix lint issues
128128
fmt: #EXHELP Formats code
129129
go fmt ./...
130130

131-
.PHONY: vet
132-
vet: #EXHELP Run go vet against code.
133-
go vet -tags '$(GO_BUILD_TAGS)' ./...
134-
135131
.PHONY: bingo-upgrade
136132
bingo-upgrade: $(BINGO) #EXHELP Upgrade tools
137133
@for pkg in $$($(BINGO) list | awk '{ print $$3 }' | tail -n +3 | sed 's/@.*//'); do \
@@ -151,7 +147,7 @@ verify-crd-compatibility: $(CRD_DIFF) manifests
151147

152148

153149
.PHONY: test
154-
test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests.
150+
test: manifests generate fmt lint test-unit test-e2e #HELP Run all tests.
155151

156152
.PHONY: e2e
157153
e2e: #EXHELP Run the e2e tests.
@@ -291,7 +287,7 @@ $(BINARIES):
291287
go build $(GO_BUILD_FLAGS) -tags '$(GO_BUILD_TAGS)' -ldflags '$(GO_BUILD_LDFLAGS)' -gcflags '$(GO_BUILD_GCFLAGS)' -asmflags '$(GO_BUILD_ASMFLAGS)' -o $(BUILDBIN)/$@ ./cmd/$@
292288

293289
.PHONY: build-deps
294-
build-deps: manifests generate fmt vet
290+
build-deps: manifests generate fmt
295291

296292
.PHONY: build go-build-local
297293
build: build-deps go-build-local #HELP Build manager binary for current GOOS and GOARCH. Default target.

0 commit comments

Comments
 (0)