Update golangci-lint to version 1.25.0

niiniyare · Apr 26, 2020 · f10697b · f10697b
1 parent 0796dd8
commit f10697b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -24,7 +24,7 @@ jobs:
     - name: Install tools
       if: matrix.os == 'ubuntu-latest'
       run: |
-        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0
+        curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.25.0
         cd $(mktemp -d)
         go mod init tmp
         go get mvdan.cc/gofumpt/gofumports

diff --git a/.golangci.yml b/.golangci.yml
@@ -10,6 +10,8 @@ linters:
   - gomnd
   - lll
   - maligned
+  - nestif
+  - testpackage
   - wsl
 
 issues:
@@ -23,6 +25,12 @@ issues:
   - linters:
     - gochecknoinits
     path: cmd/
+  - linters:
+    - gosec
+    path: internal/generate-assets/
+  - linters:
+    - gosec
+    path: internal/generate-helps/
   - linters:
     - scopelint
     path: "_test\\.go"
diff --git a/Makefile b/Makefile
@@ -16,7 +16,7 @@ generate:
 
 .PHONY: install-tools
 install-tools:
-	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.24.0
+	curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- v1.25.0
 	( cd $$(mktemp -d) && go mod init tmp && go get mvdan.cc/gofumpt/gofumports )
 
 .PHONY: lint

diff --git a/cmd/import.go b/cmd/import.go
@@ -55,6 +55,7 @@ func (c *Config) runImportCmd(cmd *cobra.Command, args []string) error {
 		if err != nil {
 			return err
 		}
+		//nolint:gosec
 		defer f.Close()
 		switch {
 		case strings.HasSuffix(arg, ".tar.gz") || strings.HasSuffix(arg, ".tgz"):