Skip to content
Merged
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/documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.24'
GO_VERSION: '1.25'
NODE_VERSION: '20.x'
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.24'
GO_VERSION: '1.25'

jobs:
update-gha-assets:
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.24'
GO_VERSION: '1.25'
NODE_VERSION: '20.x'
CGO_ENABLED: 0

Expand Down
33 changes: 17 additions & 16 deletions .github/workflows/pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ env:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.24'
GO_VERSION: '1.25'

jobs:
# Check if there is any dirty change for go mod tidy
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/tag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
# ex:
# - 1.18beta1 -> 1.18.0-beta.1
# - 1.18rc1 -> 1.18.0-rc.1
GO_VERSION: '1.24'
GO_VERSION: '1.25'
CHOCOLATEY_VERSION: 2.2.0
steps:
# temporary workaround for an error in free disk space action
Expand Down
19 changes: 17 additions & 2 deletions assets/github-action-config-v1.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"MinorVersionToConfig": {
"latest": {
"TargetVersion": "v1.64.7"
"TargetVersion": "v1.64.8"
},
"v1.10": {
"Error": "golangci-lint version 'v1.10' isn't supported: we support only v1.28.3 and later versions"
Expand Down Expand Up @@ -178,7 +178,7 @@
"TargetVersion": "v1.63.4"
},
"v1.64": {
"TargetVersion": "v1.64.7"
"TargetVersion": "v1.64.8"
},
"v1.7": {
"Error": "golangci-lint version 'v1.7' isn't supported: we support only v1.28.3 and later versions"
Expand All @@ -188,6 +188,21 @@
},
"v1.9": {
"Error": "golangci-lint version 'v1.9' isn't supported: we support only v1.28.3 and later versions"
},
"v2.0": {
"Error": "golangci-lint version 'v2.0' isn't supported: only v1 versions are supported"
},
"v2.1": {
"Error": "golangci-lint version 'v2.1' isn't supported: only v1 versions are supported"
},
"v2.2": {
"Error": "golangci-lint version 'v2.2' isn't supported: only v1 versions are supported"
},
"v2.3": {
"Error": "golangci-lint version 'v2.3' isn't supported: only v1 versions are supported"
},
"v2.4": {
"Error": "golangci-lint version 'v2.4' isn't supported: only v1 versions are supported"
}
}
}
19 changes: 17 additions & 2 deletions assets/github-action-config.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"MinorVersionToConfig": {
"latest": {
"TargetVersion": "v1.64.7"
"TargetVersion": "v1.64.8"
},
"v1.10": {
"Error": "golangci-lint version 'v1.10' isn't supported: we support only v1.28.3 and later versions"
Expand Down Expand Up @@ -178,7 +178,7 @@
"TargetVersion": "v1.63.4"
},
"v1.64": {
"TargetVersion": "v1.64.7"
"TargetVersion": "v1.64.8"
},
"v1.7": {
"Error": "golangci-lint version 'v1.7' isn't supported: we support only v1.28.3 and later versions"
Expand All @@ -188,6 +188,21 @@
},
"v1.9": {
"Error": "golangci-lint version 'v1.9' isn't supported: we support only v1.28.3 and later versions"
},
"v2.0": {
"Error": "golangci-lint version 'v2.0' isn't supported: only v1 versions are supported"
},
"v2.1": {
"Error": "golangci-lint version 'v2.1' isn't supported: only v1 versions are supported"
},
"v2.2": {
"Error": "golangci-lint version 'v2.2' isn't supported: only v1 versions are supported"
},
"v2.3": {
"Error": "golangci-lint version 'v2.3' isn't supported: only v1 versions are supported"
},
"v2.4": {
"Error": "golangci-lint version 'v2.4' isn't supported: only v1 versions are supported"
}
}
}
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.24.6
go 1.25.0

require (
4d63.com/gocheckcompilerdirectives v1.3.0
Expand Down
2 changes: 1 addition & 1 deletion pkg/commands/internal/builder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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), "")
Expand Down
9 changes: 0 additions & 9 deletions pkg/goformatters/gci/gci.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package gci

import (
"context"
"fmt"

gcicfg "github.com/daixiang0/gci/pkg/config"
"github.com/daixiang0/gci/pkg/gci"
Expand Down Expand Up @@ -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
Expand Down
Loading