chore: upgrade golangci-lint to v2 and adapt the configuration

Author: l-qing

.github/workflows/pr.yml

@@ -30,21 +30,22 @@ jobs:
 
   # We already run the current golangci-lint in tests, but here we test
   # our GitHub action with the latest stable golangci-lint.
-  golangci-lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-go@v5
-        with:
-          # https://github.com/actions/setup-go#supported-version-syntax
-          # ex:
-          # - 1.18beta1 -> 1.18.0-beta.1
-          # - 1.18rc1 -> 1.18.0-rc.1
-          go-version: ${{ env.GO_VERSION }}
-      - name: lint
-        uses: golangci/[email protected]
-        with:
-          version: latest
+  # **Important**: The v1 version of the action on GitHub does not support golang 1.25, so it needs to be disabled.
+  # golangci-lint:
+  #   runs-on: ubuntu-latest
+  #   steps:
+  #     - uses: actions/checkout@v4
+  #     - uses: actions/setup-go@v5
+  #       with:
+  #         # https://github.com/actions/setup-go#supported-version-syntax
+  #         # ex:
+  #         # - 1.18beta1 -> 1.18.0-beta.1
+  #         # - 1.18rc1 -> 1.18.0-rc.1
+  #         go-version: ${{ env.GO_VERSION }}
+  #     - name: lint
+  #       uses: golangci/[email protected]
+  #       with:
+  #         version: latest
 
   tests-on-windows:
     needs: golangci-lint # run after golangci-lint action to not produce duplicated errors
@@ -76,8 +77,8 @@ jobs:
           - ubuntu-latest
           - ubuntu-24.04-arm
         golang:
+          - '1.23'
           - '1.24'
-          - '1.25'
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v4

pkg/commands/internal/builder.go

@@ -243,7 +243,7 @@ func (b Builder) getBinaryName() string {
 
 func sanitizeVersion(v string) string {
 	fn := func(c rune) bool {
-		return !(unicode.IsLetter(c) || unicode.IsNumber(c) || c == '.' || c == '/')
+		return !unicode.IsLetter(c) && !unicode.IsNumber(c) && c != '.' && c != '/'
 	}
 
 	return strings.Join(strings.FieldsFunc(v, fn), "")

pkg/goformatters/gci/gci.go

@@ -2,7 +2,6 @@ package gci
 
 import (
 	"context"
-	"fmt"
 
 	gcicfg "github.com/daixiang0/gci/pkg/config"
 	"github.com/daixiang0/gci/pkg/gci"
@@ -41,14 +40,6 @@ func New(settings *config.GciSettings) (*Formatter, error) {
 		ModPath:        modPath,
 	}
 
-	if settings.LocalPrefixes != "" {
-		cfg.SectionStrings = []string{
-			"standard",
-			"default",
-			fmt.Sprintf("prefix(%s)", settings.LocalPrefixes),
-		}
-	}
-
 	parsedCfg, err := cfg.Parse()
 	if err != nil {
 		return nil, err

pkg/golinters/errcheck/errcheck.go

@@ -1,22 +1,16 @@
 package errcheck
 
 import (
-	"bufio"
 	"cmp"
 	"fmt"
-	"os"
-	"os/user"
-	"path/filepath"
 	"regexp"
-	"strings"
 	"sync"
 
 	"github.com/kisielk/errcheck/errcheck"
 	"golang.org/x/tools/go/analysis"
 	"golang.org/x/tools/go/packages"
 
 	"github.com/golangci/golangci-lint/pkg/config"
-	"github.com/golangci/golangci-lint/pkg/fsutils"
 	"github.com/golangci/golangci-lint/pkg/goanalysis"
 	"github.com/golangci/golangci-lint/pkg/golinters/internal"
 	"github.com/golangci/golangci-lint/pkg/lint/linter"
@@ -43,19 +37,12 @@ func New(settings *config.ErrcheckSettings) *goanalysis.Linter {
 		nil,
 	).WithContextSetter(func(lintCtx *linter.Context) {
 		// copied from errcheck
-		checker, err := getChecker(settings)
-		if err != nil {
-			lintCtx.Log.Errorf("failed to get checker: %v", err)
-			return
-		}
+		checker := getChecker(settings)
 
 		checker.Tags = lintCtx.Cfg.Run.BuildTags
 
 		analyzer.Run = func(pass *analysis.Pass) (any, error) {
 			issues := runErrCheck(lintCtx, pass, checker)
-			if err != nil {
-				return nil, err
-			}
 
 			if len(issues) == 0 {
 				return nil, nil
@@ -109,41 +96,7 @@ func runErrCheck(lintCtx *linter.Context, pass *analysis.Pass, checker *errcheck
 	return issues
 }
 
-// parseIgnoreConfig was taken from errcheck in order to keep the API identical.
-// https://github.com/kisielk/errcheck/blob/1787c4bee836470bf45018cfbc783650db3c6501/main.go#L25-L60
-func parseIgnoreConfig(s string) (map[string]*regexp.Regexp, error) {
-	if s == "" {
-		return nil, nil
-	}
-
-	cfg := map[string]*regexp.Regexp{}
-
-	for _, pair := range strings.Split(s, ",") {
-		colonIndex := strings.Index(pair, ":")
-		var pkg, re string
-		if colonIndex == -1 {
-			pkg = ""
-			re = pair
-		} else {
-			pkg = pair[:colonIndex]
-			re = pair[colonIndex+1:]
-		}
-		regex, err := regexp.Compile(re)
-		if err != nil {
-			return nil, err
-		}
-		cfg[pkg] = regex
-	}
-
-	return cfg, nil
-}
-
-func getChecker(errCfg *config.ErrcheckSettings) (*errcheck.Checker, error) {
-	ignoreConfig, err := parseIgnoreConfig(errCfg.Ignore)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse 'ignore' directive: %w", err)
-	}
-
+func getChecker(errCfg *config.ErrcheckSettings) *errcheck.Checker {
 	checker := errcheck.Checker{
 		Exclusions: errcheck.Exclusions{
 			BlankAssignments:       !errCfg.CheckAssignToBlank,
@@ -156,114 +109,7 @@ func getChecker(errCfg *config.ErrcheckSettings) (*errcheck.Checker, error) {
 		checker.Exclusions.Symbols = append(checker.Exclusions.Symbols, errcheck.DefaultExcludedSymbols...)
 	}
 
-	for pkg, re := range ignoreConfig {
-		checker.Exclusions.SymbolRegexpsByPackage[pkg] = re
-	}
-
-	if errCfg.Exclude != "" {
-		exclude, err := readExcludeFile(errCfg.Exclude)
-		if err != nil {
-			return nil, err
-		}
-
-		checker.Exclusions.Symbols = append(checker.Exclusions.Symbols, exclude...)
-	}
-
 	checker.Exclusions.Symbols = append(checker.Exclusions.Symbols, errCfg.ExcludeFunctions...)
 
-	return &checker, nil
-}
-
-func getFirstPathArg() string {
-	args := os.Args
-
-	// skip all args ([golangci-lint, run/linters]) before files/dirs list
-	for len(args) != 0 {
-		if args[0] == "run" {
-			args = args[1:]
-			break
-		}
-
-		args = args[1:]
-	}
-
-	// find first file/dir arg
-	firstArg := "./..."
-	for _, arg := range args {
-		if !strings.HasPrefix(arg, "-") {
-			firstArg = arg
-			break
-		}
-	}
-
-	return firstArg
-}
-
-func setupConfigFileSearch(name string) []string {
-	if strings.HasPrefix(name, "~") {
-		if u, err := user.Current(); err == nil {
-			name = strings.Replace(name, "~", u.HomeDir, 1)
-		}
-	}
-
-	if filepath.IsAbs(name) {
-		return []string{name}
-	}
-
-	firstArg := getFirstPathArg()
-
-	absStartPath, err := filepath.Abs(firstArg)
-	if err != nil {
-		absStartPath = filepath.Clean(firstArg)
-	}
-
-	// start from it
-	var curDir string
-	if fsutils.IsDir(absStartPath) {
-		curDir = absStartPath
-	} else {
-		curDir = filepath.Dir(absStartPath)
-	}
-
-	// find all dirs from it up to the root
-	configSearchPaths := []string{filepath.Join(".", name)}
-	for {
-		configSearchPaths = append(configSearchPaths, filepath.Join(curDir, name))
-		newCurDir := filepath.Dir(curDir)
-		if curDir == newCurDir || newCurDir == "" {
-			break
-		}
-		curDir = newCurDir
-	}
-
-	return configSearchPaths
-}
-
-func readExcludeFile(name string) ([]string, error) {
-	var err error
-	var fh *os.File
-
-	for _, path := range setupConfigFileSearch(name) {
-		if fh, err = os.Open(path); err == nil {
-			break
-		}
-	}
-
-	if fh == nil {
-		return nil, fmt.Errorf("failed reading exclude file: %s: %w", name, err)
-	}
-	defer func() { _ = fh.Close() }()
-
-	scanner := bufio.NewScanner(fh)
-
-	var excludes []string
-	for scanner.Scan() {
-		excludes = append(excludes, scanner.Text())
-	}
-
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("failed scanning file: %s: %w", name, err)
-	}
-
-	return excludes, nil
+	return &checker
 }

pkg/golinters/godot/godot.go

@@ -22,11 +22,6 @@ func New(settings *config.GodotSettings) *goanalysis.Linter {
 			Period:  settings.Period,
 			Capital: settings.Capital,
 		}
-
-		// Convert deprecated setting
-		if settings.CheckAll != nil && *settings.CheckAll {
-			dotSettings.Scope = godot.AllScope
-		}
 	}
 
 	dotSettings.Scope = cmp.Or(dotSettings.Scope, godot.DeclScope)

pkg/golinters/gofumpt/gofumpt.go

@@ -16,7 +16,7 @@ func New(settings *config.GofumptSettings) *goanalysis.Linter {
 	a := goformatters.NewAnalyzer(
 		internal.LinterLogger.Child(linterName),
 		"Checks if code and import statements are formatted, with additional rules.",
-		gofumptbase.New(settings, settings.LangVersion),
+		gofumptbase.New(settings, ""),
 	)
 
 	return goanalysis.NewLinter(

pkg/golinters/govet/govet.go

@@ -189,11 +189,6 @@ func isAnalyzerEnabled(name string, cfg *config.GovetSettings, defaultAnalyzers
 		return false
 	}
 
-	// Keeping for backward compatibility.
-	if cfg.CheckShadowing != nil && *cfg.CheckShadowing && name == shadow.Analyzer.Name {
-		return true
-	}
-
 	switch {
 	case cfg.EnableAll:
 		return !slices.Contains(cfg.Disable, name)

pkg/lint/package.go

@@ -39,13 +39,13 @@ type PackageLoader struct {
 }
 
 // NewPackageLoader creates a new PackageLoader.
-func NewPackageLoader(log logutils.Log, cfg *config.Config, args []string, goenv *goutil.Env, loadGuard *load.Guard) *PackageLoader {
+func NewPackageLoader(log logutils.Log, cfg *config.Config, args []string, goEnv *goutil.Env, loadGuard *load.Guard) *PackageLoader {
 	return &PackageLoader{
 		cfg:         cfg,
 		args:        args,
 		log:         log,
 		debugf:      logutils.Debug(logutils.DebugKeyLoader),
-		goenv:       goenv,
+		goenv:       goEnv,
 		pkgTestIDRe: regexp.MustCompile(`^(.*) \[(.*)\.test\]`),
 		loadGuard:   loadGuard,
 	}

scripts/gen_github_action_config/go.mod

@@ -3,9 +3,9 @@ module github.com/golangci/golangci-lint/scripts/gen_github_action_config
 go 1.25.0
 
 require (
-	github.com/shurcooL/githubv4 v0.0.0-20240429030203-be2daab69064
+	github.com/shurcooL/githubv4 v0.0.0-20240727222349-48295856cce7
 	github.com/stretchr/testify v1.10.0
-	golang.org/x/oauth2 v0.28.0
+	golang.org/x/oauth2 v0.30.0
 )
 
 require (