Skip to content

Commit f0ad6ab

Browse files
revert golang-linter version
1 parent ed6ca50 commit f0ad6ab

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

.github/linters/.golangci.yaml

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
version: "2"
2-
31
run:
42
timeout: 10m
53

@@ -8,29 +6,26 @@ linters:
86
enable:
97
- bodyclose
108
- copyloopvar
11-
# - depguard # Disabled - no import restrictions applied earlier
9+
- depguard
1210
- dogsled
1311
- errcheck
1412
- goconst
1513
- gocritic
16-
# - gosimple # Merged into staticcheck in v2
14+
- gofumpt
15+
- goimports
16+
- gosimple
1717
- govet
1818
- ineffassign
1919
- misspell
2020
- nakedret
2121
- nestif
2222
- nolintlint
2323
- staticcheck
24-
# - stylecheck # Merged into staticcheck in v2
25-
# - typecheck # Removed in v2
24+
# - stylecheck # Disable stylecheck until refactor
25+
- typecheck
2626
- unconvert
2727
- unused
2828

29-
formatters:
30-
enable:
31-
- gofumpt
32-
- goimports
33-
3429

3530
linters-settings:
3631
dogsled:
@@ -45,14 +40,17 @@ linters-settings:
4540
disabled-checks:
4641
- regexpMust
4742
- badCall # Remove this after CI workflow PR
43+
44+
gofumpt:
45+
lang-version: "1.24"
4846

4947
misspell:
5048
ignore-words:
5149
- cheqd
5250
- cheq
5351
- ncheq
5452

55-
staticcheck:
53+
stylecheck:
5654
# Select the Go version to target.
5755
go: "1.24"
5856
# STxxxx checks in https://staticcheck.io/docs/configuration/options/#checks
@@ -65,7 +63,15 @@ linters-settings:
6563
# https://staticcheck.io/docs/configuration/options/#initialisms
6664
initialisms: ["ACL", "API", "ASCII", "CPU", "CSS", "DNS", "EOF", "GUID", "HTML", "HTTP", "HTTPS", "ID", "IP", "JSON", "QPS", "RAM", "RPC", "SLA", "SMTP", "SQL", "SSH", "TCP", "TLS", "TTL", "UDP", "UI", "GID", "UID", "UUID", "URI", "URL", "UTF8", "VM", "XML", "XMPP", "XSRF", "XSS", "SIP", "RTP", "AMQP", "DB", "TS"]
6765

66+
depguard:
67+
rules:
68+
main:
69+
files:
70+
- $all
71+
list-mode: lax
72+
allow: "*"
73+
6874
goconst:
6975
min-occurrences: 5
7076
ignore-tests: true
71-
ignore-strings: "echo '"
77+
ignore-strings: "echo '"

.github/workflows/lint.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ jobs:
3838
cache: false
3939

4040
- name: Run golangci-lint
41-
uses: golangci/golangci-lint-action@v9
41+
uses: golangci/golangci-lint-action@v6
4242
with:
43-
version: v2.7.2
43+
version: v1.64.6
4444
args: --config .github/linters/.golangci.yaml
4545

4646
super-lint:

0 commit comments

Comments
 (0)