Skip to content

Commit

Permalink
chore: Bump golangci-lint version
Browse files Browse the repository at this point in the history
  • Loading branch information
twpayne committed Nov 11, 2024
1 parent aca64e8 commit 16f4753
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ env:
FIND_TYPOS_VERSION: 0.0.3 # https://github.com/twpayne/find-typos/tags
GO_VERSION: 1.23.3 # https://go.dev/doc/devel/release
GOFUMPT_VERSION: 0.7.0 # https://github.com/mvdan/gofumpt/releases
GOLANGCI_LINT_VERSION: 1.61.0 # https://github.com/golangci/golangci-lint/releases
GOLANGCI_LINT_VERSION: 1.62.0 # https://github.com/golangci/golangci-lint/releases
GOLINES_VERSION: 0.12.2 # https://github.com/segmentio/golines/releases
GORELEASER_VERSION: 2.4.4 # https://github.com/goreleaser/goreleaser/releases
GOVERSIONINFO_VERSION: 1.4.1 # https://github.com/josephspurrier/goversioninfo/releases
Expand Down
3 changes: 2 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ linters:
- gosmopolitan
- govet
- grouper
- iface
- importas
- inamedparam
- ineffassign
Expand Down Expand Up @@ -92,7 +93,6 @@ linters:
- gocyclo
- godox
- goheader
- gomnd
- gomoddirectives
- gosec
- ireturn
Expand All @@ -105,6 +105,7 @@ linters:
- nlreturn
- nonamedreturns
- paralleltest
- recvcheck
- testpackage
- tparallel
- varnamelen
Expand Down
6 changes: 3 additions & 3 deletions internal/chezmoilog/chezmoilog.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ type OSExecCmdLogValuer struct {
*exec.Cmd
}

// An OSExecExitErrorLogValuer wraps an *os/exec.ExitError and adds
// An OSExecExitLogValuerError wraps an *os/exec.ExitError and adds
// log/slog.LogValuer.
type OSExecExitErrorLogValuer struct {
type OSExecExitLogValuerError struct {
*exec.ExitError
}

Expand Down Expand Up @@ -52,7 +52,7 @@ func (cmd OSExecCmdLogValuer) LogValuer() slog.Value {
}

// LogValuer implements log/slog.LogValuer.LogValue.
func (err OSExecExitErrorLogValuer) LogValuer() slog.Value {
func (err OSExecExitLogValuerError) LogValuer() slog.Value {
attrs := []slog.Attr{
slog.Any("processState", OSProcessStateLogValuer{err.ExitError.ProcessState}),
}
Expand Down
2 changes: 1 addition & 1 deletion internal/cmd/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -588,7 +588,7 @@ func cmdMockCommand(ts *testscript.TestScript, neg bool, args []string) {
},
"quote": strconv.Quote,
"renderResponse": renderResponseFunc,
"replaceAll": func(old, new, s string) string { //nolint:predeclared
"replaceAll": func(old, new, s string) string { //nolint:predeclared,revive
return strings.ReplaceAll(s, old, new)
},
}).Parse(templateText)
Expand Down

0 comments on commit 16f4753

Please sign in to comment.