Re-enable staticcheck

Adds back staticcheck to the make check target. Updates: projectcontour#956 Signed-off-by: Rohan Vora <[email protected]>
rohandvora · Apr 24, 2019 · 8d6391f · 8d6391f
1 parent 0d9fd45
commit 8d6391f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ PROJECT = contour
 REGISTRY ?= gcr.io/heptio-images
 IMAGE := $(REGISTRY)/$(PROJECT)
 SRCDIRS := ./cmd ./internal ./apis
-PKGS := $(shell go list -mod=readonly ./cmd/... ./internal/...)
+PKGS := $(shell GO111MODULE=on go list -mod=readonly ./cmd/... ./internal/...)
 LOCAL_BOOTSTRAP_CONFIG = config.yaml
 TAG_LATEST ?= false
 
@@ -20,7 +20,7 @@ test-race: | test
 vet: | test
 	go vet ./...
 
-check: test test-race vet gofmt misspell unconvert ineffassign
+check: test test-race vet gofmt staticcheck misspell unconvert ineffassign
 	@echo Checking rendered files are up to date
 	@(cd deployment && bash render.sh && git diff --exit-code . || (echo "rendered files are out of date" && exit 1))
 

diff --git a/go.mod b/go.mod
@@ -41,7 +41,7 @@ require (
 	gopkg.in/alecthomas/kingpin.v2 v2.2.6
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v2 v2.2.2 // indirect
-	honnef.co/go/tools v0.0.0-20190315113450-95959eaf5e3c
+	honnef.co/go/tools v0.0.0-20190418001031-e561f6794a2a
 	k8s.io/api v0.0.0-20190226173710-145d52631d00
 	k8s.io/apimachinery v0.0.0-20190221084156-01f179d85dbc
 	k8s.io/client-go v0.0.0-20190226174127-78295b709ec6

diff --git a/internal/contour/holdoff.go b/internal/contour/holdoff.go
@@ -76,9 +76,6 @@ func (hn *HoldoffNotifier) OnChange(builder *dag.Builder) {
 // counter holds an atomically incrementing counter.
 type counter uint64
 
-func (c *counter) get() uint64 {
-	return atomic.LoadUint64((*uint64)(c))
-}
 func (c *counter) inc() uint64 {
 	return atomic.AddUint64((*uint64)(c), 1)
 }