Bump golangci-lint to version 1.36.0

niiniyare · Feb 4, 2021 · 940b563 · 940b563
1 parent 06047be
commit 940b563
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -151,7 +151,7 @@ jobs:
       - name: Lint
         uses: golangci/golangci-lint-action@v2
         with:
-          version: v1.35.2
+          version: v1.36.0
       - name: ShellCheck
         uses: ludeeus/action-shellcheck@1.0.0
         with:

diff --git a/.golangci.yml b/.golangci.yml
@@ -24,6 +24,7 @@ linters:
   - gosec
   - gosimple
   - govet
+  - ifshort
   - ineffassign
   - interfacer
   - makezero

diff --git a/Makefile b/Makefile
@@ -1,4 +1,4 @@
-GOLANGCI_LINT_VERSION=1.35.2
+GOLANGCI_LINT_VERSION=1.36.0
 
 .PHONY: default
 default: generate build run test lint format

diff --git a/chezmoi2/cmd/doctorcmd.go b/chezmoi2/cmd/doctorcmd.go
@@ -216,6 +216,7 @@ func (c *Config) runDoctorCmd(cmd *cobra.Command, args []string) error {
 		},
 	}
 
+	//nolint:ifshort
 	worstResult := checkOK
 	resultWriter := tabwriter.NewWriter(c.stdout, 3, 0, 3, ' ', 0)
 	fmt.Fprint(resultWriter, "RESULT\tCHECK\tMESSAGE\n")

diff --git a/cmd/secretkeepassxc.go b/cmd/secretkeepassxc.go
@@ -129,8 +129,7 @@ func (c *Config) keePassXCAttributeFunc(entry, attribute string) string {
 }
 
 func readPassword(prompt string) (pw []byte, err error) {
-	fd := int(os.Stdin.Fd())
-	if term.IsTerminal(fd) {
+	if fd := int(os.Stdin.Fd()); term.IsTerminal(fd) {
 		fmt.Print(prompt)
 		pw, err = term.ReadPassword(fd)
 		fmt.Println()