Bump golang ci lint to work with go 1.24

williammartin · williammartin · commit 0ead3398a716 · 2025-01-21T17:55:39.000+01:00
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -32,7 +32,7 @@ jobs:
           go mod verify
           go mod download
 
-          LINT_VERSION=1.59.1
+          LINT_VERSION=1.63.4
           curl -fsSL https://github.com/golangci/golangci-lint/releases/download/v${LINT_VERSION}/golangci-lint-${LINT_VERSION}-linux-amd64.tar.gz | \
             tar xz --strip-components 1 --wildcards \*/golangci-lint
           mkdir -p bin && mv golangci-lint bin/
@@ -53,6 +53,6 @@ jobs:
           assert-nothing-changed go fmt ./...
           assert-nothing-changed go mod tidy
 
-          bin/golangci-lint run --out-format=github-actions --timeout=3m || STATUS=$?
+          bin/golangci-lint run --out-format=colored-line-number --timeout=3m || STATUS=$?
 
           exit $STATUS
diff --git a/pkg/cmd/ruleset/shared/shared.go b/pkg/cmd/ruleset/shared/shared.go
@@ -78,7 +78,7 @@ func ParseRulesForDisplay(rules []RulesetRule) string {
 	for _, rule := range rules {
 		display.WriteString(fmt.Sprintf("- %s", rule.Type))
 
-		if rule.Parameters != nil && len(rule.Parameters) > 0 {
+		if len(rule.Parameters) > 0 {
 			display.WriteString(": ")
 
 			// sort these keys too for consistency
diff --git a/pkg/cmdutil/json_flags.go b/pkg/cmdutil/json_flags.go
@@ -254,7 +254,7 @@ func (e *jsonExporter) exportData(v reflect.Value) interface{} {
 		}
 		return m.Interface()
 	case reflect.Struct:
-		if v.CanAddr() && reflect.PtrTo(v.Type()).Implements(exportableType) {
+		if v.CanAddr() && reflect.PointerTo(v.Type()).Implements(exportableType) {
 			ve := v.Addr().Interface().(exportable)
 			return ve.ExportData(e.fields)
 		} else if v.Type().Implements(exportableType) {

Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ func (e *jsonExporter) exportData(v reflect.Value) interface{} {`
`254`	`254`	`}`
`255`	`255`	`return m.Interface()`
`256`	`256`	`case reflect.Struct:`
`257`		`- if v.CanAddr() && reflect.PtrTo(v.Type()).Implements(exportableType) {`
	`257`	`+ if v.CanAddr() && reflect.PointerTo(v.Type()).Implements(exportableType) {`
`258`	`258`	`ve := v.Addr().Interface().(exportable)`
`259`	`259`	`return ve.ExportData(e.fields)`
`260`	`260`	`} else if v.Type().Implements(exportableType) {`