Skip to content

Commit 446c087

Browse files
chore(deps): update dependency go to v1.25.0 (alauda-v1.64.8) (#12)
1 parent d14bad8 commit 446c087

File tree

23 files changed

+89
-228
lines changed

23 files changed

+89
-228
lines changed

.github/workflows/documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
# ex:
1717
# - 1.18beta1 -> 1.18.0-beta.1
1818
# - 1.18rc1 -> 1.18.0-rc.1
19-
GO_VERSION: '1.24'
19+
GO_VERSION: '1.25'
2020
NODE_VERSION: '20.x'
2121
CGO_ENABLED: 0
2222
steps:

.github/workflows/post-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ env:
99
# ex:
1010
# - 1.18beta1 -> 1.18.0-beta.1
1111
# - 1.18rc1 -> 1.18.0-rc.1
12-
GO_VERSION: '1.24'
12+
GO_VERSION: '1.25'
1313

1414
jobs:
1515
update-gha-assets:

.github/workflows/pr-documentation.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
# ex:
1414
# - 1.18beta1 -> 1.18.0-beta.1
1515
# - 1.18rc1 -> 1.18.0-rc.1
16-
GO_VERSION: '1.24'
16+
GO_VERSION: '1.25'
1717
NODE_VERSION: '20.x'
1818
CGO_ENABLED: 0
1919

.github/workflows/pr.yml

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ env:
1111
# ex:
1212
# - 1.18beta1 -> 1.18.0-beta.1
1313
# - 1.18rc1 -> 1.18.0-rc.1
14-
GO_VERSION: '1.24'
14+
GO_VERSION: '1.25'
1515

1616
jobs:
1717
# Check if there is any dirty change for go mod tidy
@@ -30,21 +30,22 @@ jobs:
3030
3131
# We already run the current golangci-lint in tests, but here we test
3232
# our GitHub action with the latest stable golangci-lint.
33-
golangci-lint:
34-
runs-on: ubuntu-latest
35-
steps:
36-
- uses: actions/checkout@v4
37-
- uses: actions/setup-go@v5
38-
with:
39-
# https://github.com/actions/setup-go#supported-version-syntax
40-
# ex:
41-
# - 1.18beta1 -> 1.18.0-beta.1
42-
# - 1.18rc1 -> 1.18.0-rc.1
43-
go-version: ${{ env.GO_VERSION }}
44-
- name: lint
45-
uses: golangci/[email protected]
46-
with:
47-
version: latest
33+
# **Important**: The v1 version of the action on GitHub does not support golang 1.25, so it needs to be disabled.
34+
# golangci-lint:
35+
# runs-on: ubuntu-latest
36+
# steps:
37+
# - uses: actions/checkout@v4
38+
# - uses: actions/setup-go@v5
39+
# with:
40+
# # https://github.com/actions/setup-go#supported-version-syntax
41+
# # ex:
42+
# # - 1.18beta1 -> 1.18.0-beta.1
43+
# # - 1.18rc1 -> 1.18.0-rc.1
44+
# go-version: ${{ env.GO_VERSION }}
45+
# - name: lint
46+
# uses: golangci/[email protected]
47+
# with:
48+
# version: latest
4849

4950
tests-on-windows:
5051
needs: golangci-lint # run after golangci-lint action to not produce duplicated errors

.github/workflows/tag.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
# ex:
1313
# - 1.18beta1 -> 1.18.0-beta.1
1414
# - 1.18rc1 -> 1.18.0-rc.1
15-
GO_VERSION: '1.24'
15+
GO_VERSION: '1.25'
1616
CHOCOLATEY_VERSION: 2.2.0
1717
steps:
1818
# temporary workaround for an error in free disk space action

assets/github-action-config-v1.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"MinorVersionToConfig": {
33
"latest": {
4-
"TargetVersion": "v1.64.7"
4+
"TargetVersion": "v1.64.8"
55
},
66
"v1.10": {
77
"Error": "golangci-lint version 'v1.10' isn't supported: we support only v1.28.3 and later versions"
@@ -178,7 +178,7 @@
178178
"TargetVersion": "v1.63.4"
179179
},
180180
"v1.64": {
181-
"TargetVersion": "v1.64.7"
181+
"TargetVersion": "v1.64.8"
182182
},
183183
"v1.7": {
184184
"Error": "golangci-lint version 'v1.7' isn't supported: we support only v1.28.3 and later versions"
@@ -188,6 +188,21 @@
188188
},
189189
"v1.9": {
190190
"Error": "golangci-lint version 'v1.9' isn't supported: we support only v1.28.3 and later versions"
191+
},
192+
"v2.0": {
193+
"Error": "golangci-lint version 'v2.0' isn't supported: only v1 versions are supported"
194+
},
195+
"v2.1": {
196+
"Error": "golangci-lint version 'v2.1' isn't supported: only v1 versions are supported"
197+
},
198+
"v2.2": {
199+
"Error": "golangci-lint version 'v2.2' isn't supported: only v1 versions are supported"
200+
},
201+
"v2.3": {
202+
"Error": "golangci-lint version 'v2.3' isn't supported: only v1 versions are supported"
203+
},
204+
"v2.4": {
205+
"Error": "golangci-lint version 'v2.4' isn't supported: only v1 versions are supported"
191206
}
192207
}
193208
}

assets/github-action-config.json

Lines changed: 17 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"MinorVersionToConfig": {
33
"latest": {
4-
"TargetVersion": "v1.64.7"
4+
"TargetVersion": "v1.64.8"
55
},
66
"v1.10": {
77
"Error": "golangci-lint version 'v1.10' isn't supported: we support only v1.28.3 and later versions"
@@ -178,7 +178,7 @@
178178
"TargetVersion": "v1.63.4"
179179
},
180180
"v1.64": {
181-
"TargetVersion": "v1.64.7"
181+
"TargetVersion": "v1.64.8"
182182
},
183183
"v1.7": {
184184
"Error": "golangci-lint version 'v1.7' isn't supported: we support only v1.28.3 and later versions"
@@ -188,6 +188,21 @@
188188
},
189189
"v1.9": {
190190
"Error": "golangci-lint version 'v1.9' isn't supported: we support only v1.28.3 and later versions"
191+
},
192+
"v2.0": {
193+
"Error": "golangci-lint version 'v2.0' isn't supported: only v1 versions are supported"
194+
},
195+
"v2.1": {
196+
"Error": "golangci-lint version 'v2.1' isn't supported: only v1 versions are supported"
197+
},
198+
"v2.2": {
199+
"Error": "golangci-lint version 'v2.2' isn't supported: only v1 versions are supported"
200+
},
201+
"v2.3": {
202+
"Error": "golangci-lint version 'v2.3' isn't supported: only v1 versions are supported"
203+
},
204+
"v2.4": {
205+
"Error": "golangci-lint version 'v2.4' isn't supported: only v1 versions are supported"
191206
}
192207
}
193208
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/golangci/golangci-lint
22

3-
go 1.24.6
3+
go 1.25.0
44

55
require (
66
4d63.com/gocheckcompilerdirectives v1.3.0

pkg/commands/internal/builder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ func (b Builder) getBinaryName() string {
243243

244244
func sanitizeVersion(v string) string {
245245
fn := func(c rune) bool {
246-
return !(unicode.IsLetter(c) || unicode.IsNumber(c) || c == '.' || c == '/')
246+
return !unicode.IsLetter(c) && !unicode.IsNumber(c) && c != '.' && c != '/'
247247
}
248248

249249
return strings.Join(strings.FieldsFunc(v, fn), "")

pkg/goformatters/gci/gci.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package gci
22

33
import (
44
"context"
5-
"fmt"
65

76
gcicfg "github.com/daixiang0/gci/pkg/config"
87
"github.com/daixiang0/gci/pkg/gci"
@@ -41,14 +40,6 @@ func New(settings *config.GciSettings) (*Formatter, error) {
4140
ModPath: modPath,
4241
}
4342

44-
if settings.LocalPrefixes != "" {
45-
cfg.SectionStrings = []string{
46-
"standard",
47-
"default",
48-
fmt.Sprintf("prefix(%s)", settings.LocalPrefixes),
49-
}
50-
}
51-
5243
parsedCfg, err := cfg.Parse()
5344
if err != nil {
5445
return nil, err

0 commit comments

Comments
 (0)