Update linting (#149)

* Rely on locally installed golangci-lint instead of trying to install it Signed-off-by: Thane Thomson <[email protected]> * go mod tidy Signed-off-by: Thane Thomson <[email protected]> * Remove "Temporary" check as it has been deprecated Signed-off-by: Thane Thomson <[email protected]> * Bump golangci-lint to v1.49.0 Signed-off-by: Thane Thomson <[email protected]> Signed-off-by: Thane Thomson <[email protected]>
informalsystems · Sep 7, 2022 · 0b5598b · 0b5598b
1 parent e26e39e
commit 0b5598b
Show file tree

Hide file tree

Showing 5 changed files with 85 additions and 44 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -17,6 +17,6 @@ jobs:
       - uses: golangci/[email protected]
         with:
           # Required: the version of golangci-lint is required and must be specified without patch version: we always use the latest patch version.
-          version: v1.30
+          version: v1.49.0
           args: --timeout 10m
           github-token: ${{ secrets.github_token }}
diff --git a/Makefile b/Makefile
@@ -30,11 +30,8 @@ test:
 bench:
 	go test -bench="Benchmark" -run="notests" ./...
 
-$(GOPATH)/bin/golangci-lint:
-	go get -u github.com/golangci/golangci-lint/cmd/golangci-lint
-
-lint: $(GOPATH)/bin/golangci-lint
-	$(GOPATH)/bin/golangci-lint run ./...
+lint:
+	golangci-lint run ./...
 
 clean:
 	rm -rf $(BUILD_DIR)
diff --git a/go.mod b/go.mod
@@ -5,20 +5,25 @@ go 1.15
 require (
 	github.com/btcsuite/btcd v0.22.0-beta // indirect
 	github.com/containerd/continuity v0.1.0 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/go-kit/kit v0.12.0 // indirect
 	github.com/gorilla/websocket v1.5.0
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
+	github.com/lib/pq v1.10.6 // indirect
 	github.com/mimoo/StrobeGo v0.0.0-20210601165009-122bf33a46e0 // indirect
-	github.com/prometheus/client_golang v1.12.0
+	github.com/onsi/gomega v1.20.0 // indirect
+	github.com/prometheus/client_golang v1.13.0
 	github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect
 	github.com/sasha-s/go-deadlock v0.3.1 // indirect
 	github.com/satori/go.uuid v1.2.0
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.9.0
 	github.com/spf13/cobra v1.5.0
+	github.com/stretchr/testify v1.8.0 // indirect
 	github.com/tendermint/tendermint v0.34.14
-	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519
-	golang.org/x/net v0.0.0-20211029224645-99673261e6eb // indirect
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
-	google.golang.org/grpc v1.42.0 // indirect
+	golang.org/x/crypto v0.0.0-20220722155217-630584e8d5aa
+	golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
+	golang.org/x/sys v0.0.0-20220906165534-d0df966e6959 // indirect
+	google.golang.org/genproto v0.0.0-20220519153652-3a47de7e79bd // indirect
+	google.golang.org/grpc v1.46.2 // indirect
 	gopkg.in/check.v1 v1.0.0-20200902074654-038fdea0a05b // indirect
 )