diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 95264d1..6339ebd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -14,7 +14,7 @@ jobs: - name: golangci-lint uses: golangci/golangci-lint-action@v3 with: - version: v1.37 + version: v1.50 env: VERBOSE: "true" diff --git a/.golangci.yml b/.golangci.yml index b5356f5..d920c9b 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -7,8 +7,9 @@ linters-settings: golint: min-confidence: 0 govet: - check-shadowing: true enable-all: true + disable: + - fieldalignment lll: line-length: 80 tab-width: 4 @@ -21,10 +22,10 @@ linters: disable-all: true enable: - bodyclose - - deadcode - depguard - dupl - errcheck + - exportloopref - funlen - gochecknoinits - goconst @@ -32,7 +33,6 @@ linters: - gocyclo - goerr113 - goimports - - golint - goprintffuncname - gosec - gosimple @@ -44,19 +44,15 @@ linters: - nlreturn - noctx - nolintlint - - scopelint + - revive - sqlclosecheck - staticcheck - - structcheck - typecheck - unconvert - unused - - varcheck - whitespace issues: - include: - # - EXC0002 # disable excluding of issues about comments from golint exclude: - Using the variable on range scope `tt` in function literal - Using the variable on range scope `tc` in function literal diff --git a/Makefile b/Makefile index 3207404..fcf1cf8 100644 --- a/Makefile +++ b/Makefile @@ -48,7 +48,7 @@ endef $(eval $(call tool,godoc,golang.org/x/tools/cmd/godoc)) $(eval $(call tool,gofumports,mvdan.cc/gofumpt/gofumports)) -$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.37)) +$(eval $(call tool,golangci-lint,github.com/golangci/golangci-lint/cmd/golangci-lint@v1.50)) .PHONY: tools tools: $(TOOLS) diff --git a/undent_test.go b/undent_test.go index 4de9cce..c90f68b 100644 --- a/undent_test.go +++ b/undent_test.go @@ -717,7 +717,7 @@ func TestPrint(t *testing.T) { for _, tt := range stringTestCases { t.Run(tt.name, func(t *testing.T) { got, err := fakeio.Stdout().Do(func() { - Print(tt.s, 5, tt.s) + _, _ = Print(tt.s, 5, tt.s) }) require.NoError(t, err) @@ -731,7 +731,7 @@ func TestPrintf(t *testing.T) { for _, tt := range stringfTestCases { t.Run(tt.name, func(t *testing.T) { got, err := fakeio.Stdout().Do(func() { - Printf(tt.s, tt.a...) + _, _ = Printf(tt.s, tt.a...) }) require.NoError(t, err) @@ -746,7 +746,7 @@ func TestFprint(t *testing.T) { t.Run(tt.name, func(t *testing.T) { var buf bytes.Buffer - Fprint(&buf, tt.s, 5, tt.s) + _, _ = Fprint(&buf, tt.s, 5, tt.s) got := buf.String() assert.IsType(t, "", got) @@ -760,7 +760,7 @@ func TestFprintf(t *testing.T) { t.Run(tt.name, func(t *testing.T) { var buf bytes.Buffer - Fprintf(&buf, tt.s, tt.a...) + _, _ = Fprintf(&buf, tt.s, tt.a...) got := buf.String() assert.IsType(t, "", got)