Bump golangci-lint to version 1.22.2

twpayne · Jan 6, 2020 · 4be8957 · 4be8957
1 parent 3e733b1
commit 4be8957
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,7 +15,7 @@ jobs:
       run: go mod download
     - name: Install tools
       run: |
-        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.21.0
+        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.22.2
         cd $(mktemp -d)
         go mod init tmp
         go get github.com/gobuffalo/packr/v2/packr2
@@ -95,7 +95,7 @@ jobs:
       run: go mod download
     - name: Install tools
       run: |
-        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.21.0
+        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.22.2
         cd $(mktemp -d)
         go mod init tmp
         go get github.com/gobuffalo/packr/v2/packr2

diff --git a/.golangci.yml b/.golangci.yml
@@ -2,10 +2,12 @@ linters:
   enable-all: true
   disable:
   - funlen
+  - gochecknoglobals
   - gocognit
   - goconst
   - gocyclo
   - godox
+  - gomnd
   - lll
   - maligned
   - wsl
@@ -19,12 +21,8 @@ issues:
     - dupl
     path: "secretpass.go"
   - linters:
-    - gochecknoglobals
     - gochecknoinits
     path: cmd/
-  - linters:
-    - gochecknoglobals
-    path: internal/
   - linters:
     - scopelint
     path: "_test\\.go"
diff --git a/Makefile b/Makefile
@@ -35,7 +35,7 @@ generate:
 
 .PHONY: install-tools
 install-tools:
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.21.0
+	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.22.2
 	GO111MODULE=off go get -u \
 		github.com/gobuffalo/packr/v2/packr2 \
 		mvdan.cc/gofumpt/gofumports