Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

go1.21 support #3922

Merged
merged 10 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from 8 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/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
name: Build and deploy documentation
runs-on: ubuntu-latest
env:
GO_VERSION: '1.20'
GO_VERSION: '1.21'
NODE_VERSION: '20.x'
CGO_ENABLED: 0

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 @@ -18,7 +18,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
go-version: '1.20'
go-version: '1.21'

- name: Update GitHub action config
run: make assets/github-action-config.json
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr-extra.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.20'
go-version: '1.21'
- name: Run go list
run: go list -json -m all > go.list
- name: Nancy
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
pull_request:

env:
GO_VERSION: '1.20'
GO_VERSION: '1.21'

jobs:
# Check if there is any dirty change for go mod tidy
Expand Down Expand Up @@ -41,7 +41,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.21
# go-version: ${{ env.GO_VERSION }}
go-version: '1.20'
- name: lint
uses: golangci/golangci-lint-action@v3.6.0
with:
Expand Down Expand Up @@ -88,8 +90,8 @@ jobs:
strategy:
matrix:
golang:
- 1.19
- '1.20'
- '1.21'
steps:
- uses: actions/checkout@v3
- name: Install Go
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
go-version: '1.20'
go-version: '1.21'
- name: Unshallow
run: git fetch --prune --unshallow

Expand Down Expand Up @@ -48,7 +48,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
go-version: '1.20'
go-version: '1.21'

- name: Unshallow
run: git fetch --prune --unshallow
Expand Down
2 changes: 2 additions & 0 deletions .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,8 @@ issues:
text: "SA1019: (.+).(GoVersion|LangVersion) is deprecated: use the global `run.go` instead."
- path: pkg/golinters/unused.go
text: "rangeValCopy: each iteration copies 160 bytes \\(consider pointers or indexing\\)"
- path: test/(fix|linters)_test.go
text: "string `gocritic.go` has 3 occurrences, make it a constant"

run:
timeout: 5m
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/golangci/golangci-lint

go 1.19
go 1.20

require (
4d63.com/gocheckcompilerdirectives v1.2.1
Expand Down
4 changes: 2 additions & 2 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -41,13 +41,13 @@ type Version struct {
Debug bool `mapstructure:"debug"`
}

func IsGreaterThanOrEqualGo118(v string) bool {
func IsGreaterThanOrEqualGo121(v string) bool {
v1, err := hcversion.NewVersion(strings.TrimPrefix(v, "go"))
if err != nil {
return false
}

limit, err := hcversion.NewVersion("1.18")
limit, err := hcversion.NewVersion("1.21")
if err != nil {
return false
}
Expand Down
14 changes: 14 additions & 0 deletions pkg/golinters/gocritic.go
Original file line number Diff line number Diff line change
Expand Up @@ -283,6 +283,20 @@ func newGoCriticSettingsWrapper(settings *config.GoCriticSettings, logger loguti
allCheckerMap[checkInfo.Name] = checkInfo
}

if settings != nil && config.IsGreaterThanOrEqualGo121(settings.Go) {
var enabledChecks []string
for _, check := range settings.EnabledChecks {
if check == "ruleguard" {
logger.Warnf("%s: check %q is disabled for go1.21 https://github.com/golangci/golangci-lint/issues/3933", goCriticName, "ruleguard")
continue
}

enabledChecks = append(enabledChecks, check)
}

settings.EnabledChecks = enabledChecks
}

return &goCriticSettingsWrapper{
GoCriticSettings: settings,
logger: logger,
Expand Down
2 changes: 1 addition & 1 deletion pkg/lint/linter/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ func (lc *Config) Name() string {
}

func (lc *Config) WithNoopFallback(cfg *config.Config) *Config {
if cfg != nil && config.IsGreaterThanOrEqualGo118(cfg.Run.Go) {
if cfg != nil && config.IsGreaterThanOrEqualGo121(cfg.Run.Go) {
lc.Linter = &Noop{
name: lc.Linter.Name(),
desc: lc.Linter.Desc(),
Expand Down
12 changes: 12 additions & 0 deletions test/fix_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,12 @@ func TestFix(t *testing.T) {

for _, input := range sources {
input := input

if filepath.Base(input) == "gocritic.go" {
t.Logf("skip gocritic because of a bug with ruleguard")
continue
}

t.Run(filepath.Base(input), func(t *testing.T) {
t.Parallel()

Expand Down Expand Up @@ -80,6 +86,12 @@ func TestFix_pathPrefix(t *testing.T) {

for _, input := range sources {
input := input

if filepath.Base(input) == "gocritic.go" {
t.Logf("skip gocritic because of a bug with ruleguard")
continue
}

t.Run(filepath.Base(input), func(t *testing.T) {
t.Parallel()

Expand Down
6 changes: 6 additions & 0 deletions test/linters_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ func testSourcesFromDir(t *testing.T, dir string) {

for _, source := range sources {
source := source

if filepath.Base(source) == "gocritic.go" {
t.Logf("skip gocritic because of a bug with ruleguard")
continue
}

t.Run(filepath.Base(source), func(subTest *testing.T) {
subTest.Parallel()

Expand Down
Loading