Disable exportloopref in go 1.22 or above

sapcc · Mar 21, 2024 · 29e3261 · 29e3261
1 parent d9de26b
commit 29e3261
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/.golangci.yaml b/.golangci.yaml
@@ -115,7 +115,6 @@ linters:
     - durationcheck
     - errcheck
     - errorlint
-    - exportloopref
     - forbidigo
     - ginkgolinter
     - gocheckcompilerdirectives

diff --git a/internal/golangcilint/golangci_lint.go b/internal/golangcilint/golangci_lint.go
@@ -17,6 +17,7 @@ package golangcilint
 import (
 	"fmt"
 	"os"
+	"strconv"
 	"strings"
 	"text/template"
 
@@ -157,7 +158,9 @@ linters:
 		- durationcheck
 		- errcheck
 		- errorlint
+  {{- if lt .GoMinorVersion 22 }}
 		- exportloopref
+  {{- end }}
 		- forbidigo
 		- ginkgolinter
 		- gocheckcompilerdirectives
@@ -188,27 +191,29 @@ linters:
 `, "\t", "  "))))
 
 type configTmplData struct {
+	GoMinorVersion      int
 	ModulePath          string
 	ModDownloadMode     string
 	MisspellIgnoreWords []string
 	ErrcheckExcludes    []string
 	SkipDirs            []string
 }
 
-func RenderConfig(cfg core.GolangciLintConfiguration, vendoring bool, modulePath string, misspellIgnoreWords []string) {
+func RenderConfig(cfg core.Configuration, sr core.ScanResult) {
 	mode := "readonly"
-	if vendoring {
+	if cfg.Golang.EnableVendoring {
 		mode = "vendor"
 	}
 
 	f := must.Return(os.Create(".golangci.yaml"))
 	fmt.Fprintln(f, core.AutogeneratedHeader+"\n")
 	must.Succeed(configTmpl.Execute(f, configTmplData{
-		ModulePath:          modulePath,
+		GoMinorVersion:      must.Return(strconv.Atoi(strings.Split(sr.GoVersion, ".")[1])),
+		ModulePath:          sr.MustModulePath(),
 		ModDownloadMode:     mode,
-		MisspellIgnoreWords: misspellIgnoreWords,
-		ErrcheckExcludes:    cfg.ErrcheckExcludes,
-		SkipDirs:            cfg.SkipDirs,
+		MisspellIgnoreWords: cfg.SpellCheck.IgnoreWords,
+		ErrcheckExcludes:    cfg.GolangciLint.ErrcheckExcludes,
+		SkipDirs:            cfg.GolangciLint.SkipDirs,
 	}))
 	fmt.Fprintln(f) // empty line at end
 

diff --git a/main.go b/main.go
@@ -73,7 +73,7 @@ func main() {
 
 	// Render golangci-lint config file
 	if cfg.GolangciLint.CreateConfig {
-		golangcilint.RenderConfig(cfg.GolangciLint, cfg.Golang.EnableVendoring, sr.MustModulePath(), cfg.SpellCheck.IgnoreWords)
+		golangcilint.RenderConfig(cfg, sr)
 	}
 
 	// Render Goreleaser config file