Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/deploy-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.25'
GO_VERSION: '1.26.0-rc.1'
HUGO_VERSION: 0.148.1
CGO_ENABLED: 0
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/post-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ env:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.25'
GO_VERSION: '1.26.0-rc.1'

jobs:
update-gha-assets:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.25'
GO_VERSION: '1.26.0-rc.1'

jobs:
# Check if there is any dirty change for go mod tidy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.25'
GO_VERSION: '1.26.0-rc.1'
HUGO_VERSION: 0.148.1
CGO_ENABLED: 0

Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/pr-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.25'
GO_VERSION: '1.26.0-rc.1'

jobs:
# Check if there is any dirty change for go mod tidy
Expand Down Expand Up @@ -39,7 +39,9 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
go-version: ${{ env.GO_VERSION }}
# TODO(ldez) must be changed after the first release of golangci-lint with go1.25
# go-version: ${{ env.GO_VERSION }}
go-version: '1.25'
- name: lint
uses: golangci/[email protected]
with:
Expand Down Expand Up @@ -75,8 +77,8 @@ jobs:
- ubuntu-latest
- ubuntu-24.04-arm
golang:
- '1.24'
- '1.25'
- '1.26.0-rc.1'
runs-on: ${{ matrix.os }}
steps:
- uses: actions/checkout@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.25'
GO_VERSION: '1.26.0-rc.1'
CHOCOLATEY_VERSION: 2.2.0
steps:
# temporary workaround for an error in free disk space action
Expand Down
2 changes: 1 addition & 1 deletion build/buildx-alpine.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.4
FROM golang:1.25-alpine
FROM golang:1.26-alpine

ARG TARGETPLATFORM

Expand Down
2 changes: 1 addition & 1 deletion build/buildx.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1.4
FROM golang:1.25
FROM golang:1.26

ARG TARGETPLATFORM

Expand Down
8 changes: 6 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
module github.com/golangci/golangci-lint/v2

go 1.24.0
go 1.25.0

ignore (
./docs
./jsonschema
)

require (
4d63.com/gocheckcompilerdirectives v1.3.0
Expand Down Expand Up @@ -135,7 +140,6 @@ require (
go-simpler.org/sloglint v0.11.1
go.augendre.info/arangolint v0.3.1
go.augendre.info/fatcontext v0.9.0
go.uber.org/automaxprocs v1.6.0
go.yaml.in/yaml/v3 v3.0.4
golang.org/x/mod v0.31.0
golang.org/x/sync v0.19.0
Expand Down
4 changes: 0 additions & 4 deletions go.sum

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 2 additions & 11 deletions pkg/commands/run.go
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"
"github.com/spf13/viper"
"go.uber.org/automaxprocs/maxprocs"
"go.yaml.in/yaml/v3"
"golang.org/x/mod/sumdb/dirhash"

Expand Down Expand Up @@ -160,16 +159,8 @@ func (c *runCommand) persistentPreRunE(cmd *cobra.Command, args []string) error
return fmt.Errorf("can't load config: %w", err)
}

if c.cfg.Run.Concurrency == 0 {
// `runtime.GOMAXPROCS` defaults to the value of `runtime.NumCPU`.
backup := runtime.GOMAXPROCS(0)

// Automatically set GOMAXPROCS to match Linux container CPU quota.
_, err := maxprocs.Set(maxprocs.Logger(c.log.Infof))
if err != nil {
runtime.GOMAXPROCS(backup)
}
} else {
// https://go.dev/doc/go1.25#container-aware-gomaxprocs
if c.cfg.Run.Concurrency != 0 {
runtime.GOMAXPROCS(c.cfg.Run.Concurrency)
}

Expand Down
6 changes: 5 additions & 1 deletion pkg/goformatters/gci/internal/section/standard_list.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/golinters/arangolint/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module arangolint

go 1.24.0
go 1.25.0

require github.com/arangodb/go-driver/v2 v2.1.5

Expand Down
2 changes: 1 addition & 1 deletion pkg/golinters/exptostd/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module exptostd

go 1.24.0
go 1.25.0

require golang.org/x/exp v0.0.0-20250506013437-ce4c2cf36ca6
2 changes: 1 addition & 1 deletion pkg/golinters/ginkgolinter/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module ginkgolinter

go 1.24.0
go 1.25.0

require (
github.com/onsi/ginkgo/v2 v2.27.2
Expand Down
2 changes: 1 addition & 1 deletion pkg/golinters/gomodguard/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module gomodguard

go 1.24.0
go 1.25.0

require (
golang.org/x/mod v0.24.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/golinters/loggercheck/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module loggercheck

go 1.24.0
go 1.25.0

require (
github.com/go-kit/log v0.2.1
Expand Down
2 changes: 1 addition & 1 deletion pkg/golinters/protogetter/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module protogetter

go 1.24.0
go 1.25.0

require (
google.golang.org/grpc v1.76.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/golinters/spancheck/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module spancheck

go 1.24.0
go 1.25.0

require (
go.opentelemetry.io/otel v1.38.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/golinters/zerologlint/testdata/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module zerologlint

go 1.24.0
go 1.25.0

require github.com/rs/zerolog v1.34.0

Expand Down
Loading