eeafj/golangci-lint
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

fix: trim Go version (#3995)
Some checks failed
Release a tag / release (push) Has been cancelled
Release a tag / docker-release (map[Dockerfile:build/Dockerfile]) (push) Has been cancelled
Release a tag / docker-release (map[Dockerfile:build/alpine.Dockerfile]) (push) Has been cancelled

Browse Source
This commit is contained in:
Ludovic Fernandez 2023-08-09 13:43:07 +02:00 committed by GitHub
parent e0a8bd8543
commit c1d8c565fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
pkg/lint/lintersdb/manager.go
View File

@ -1,6 +1,8 @@
package lintersdb package lintersdb
import ( import (
"regexp"
"github.com/golangci/golangci-lint/pkg/config" "github.com/golangci/golangci-lint/pkg/config"
"github.com/golangci/golangci-lint/pkg/golinters" "github.com/golangci/golangci-lint/pkg/golinters"
"github.com/golangci/golangci-lint/pkg/lint/linter" "github.com/golangci/golangci-lint/pkg/lint/linter"
@ -227,7 +229,7 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
} }
if gocriticCfg != nil { if gocriticCfg != nil {
gocriticCfg.Go = m.cfg.Run.Go gocriticCfg.Go = trimGoVersion(m.cfg.Run.Go)
} }
if gofumptCfg != nil && gofumptCfg.LangVersion == "" { if gofumptCfg != nil && gofumptCfg.LangVersion == "" {
@ -235,16 +237,16 @@ func (m Manager) GetAllSupportedLinterConfigs() []*linter.Config {
} }
if staticcheckCfg != nil && staticcheckCfg.GoVersion == "" { if staticcheckCfg != nil && staticcheckCfg.GoVersion == "" {
staticcheckCfg.GoVersion = m.cfg.Run.Go staticcheckCfg.GoVersion = trimGoVersion(m.cfg.Run.Go)
} }
if gosimpleCfg != nil && gosimpleCfg.GoVersion == "" { if gosimpleCfg != nil && gosimpleCfg.GoVersion == "" {
gosimpleCfg.GoVersion = m.cfg.Run.Go gosimpleCfg.GoVersion = trimGoVersion(m.cfg.Run.Go)
} }
if stylecheckCfg != nil && stylecheckCfg.GoVersion != "" { if stylecheckCfg != nil && stylecheckCfg.GoVersion != "" {
stylecheckCfg.GoVersion = m.cfg.Run.Go stylecheckCfg.GoVersion = trimGoVersion(m.cfg.Run.Go)
} }
if unusedCfg != nil && unusedCfg.GoVersion == "" { if unusedCfg != nil && unusedCfg.GoVersion == "" {
unusedCfg.GoVersion = m.cfg.Run.Go unusedCfg.GoVersion = trimGoVersion(m.cfg.Run.Go)
} }
} }
@ -928,3 +930,21 @@ func (m Manager) GetAllLinterConfigsForPreset(p string) []*linter.Config {
return ret return ret
} }
// Trims the Go version to keep only M.m.
// Since Go 1.21 the version inside the go.mod can be a patched version (ex: 1.21.0).
// https://go.dev/doc/toolchain#versions
// This a problem with staticcheck and gocritic.
func trimGoVersion(v string) string {
if v == "" {
return ""
}
exp := regexp.MustCompile(`(\d\.\d+)\.\d+`)
if exp.MatchString(v) {
return exp.FindStringSubmatch(v)[1]
}
return v
}