Skip to content

Commit 2a7a5b0

Browse files
committed
chore(deps): fix lint and update deps (#335)
1 parent 31812d3 commit 2a7a5b0

28 files changed

Lines changed: 321 additions & 126 deletions

.github/workflows/ci-workflow.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,20 @@ jobs:
88
name: lint
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: actions/setup-go@v4
11+
- uses: actions/setup-go@v5
1212
with:
13-
go-version: 1.23
14-
- uses: actions/checkout@v3
13+
go-version: 1.26
14+
- uses: actions/checkout@v4
1515
- name: golangci-lint
16-
uses: golangci/golangci-lint-action@v3
16+
uses: golangci/golangci-lint-action@v7
1717
with:
18-
version: v1.60.3
18+
version: v2.10.1
1919
args: --verbose
2020

2121
test:
2222
strategy:
2323
matrix:
24-
go-version: [1.23]
24+
go-version: [1.26]
2525
platform: [ubuntu-latest, macos-latest]
2626

2727
runs-on: ${{ matrix.platform }}

.golangci.yml

Lines changed: 61 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,72 +1,76 @@
1-
linters-settings:
2-
errcheck:
3-
check-type-assertions: true
4-
goconst:
5-
min-len: 2
6-
min-occurrences: 3
7-
gocritic:
8-
enabled-tags:
9-
- diagnostic
10-
- experimental
11-
- opinionated
12-
- performance
13-
- style
14-
govet:
15-
shadow: true
16-
disable:
17-
- fieldalignment # too strict
1+
version: "2"
2+
3+
run:
4+
timeout: 5m
5+
issues-exit-code: 1
186

19-
nolintlint:
20-
require-explanation: false
21-
require-specific: true
227
linters:
23-
disable-all: true
248
enable:
25-
- bodyclose
26-
# - deadcode
27-
# depguard needs to be reviewed properly and then configured, before
28-
# it can be re-enabled.
29-
# https://github.com/OpenPeeDeeP/depguard#example-configs
30-
# - depguard
31-
- copyloopvar
32-
- dogsled
33-
# - dupl
9+
# correctness
3410
- errcheck
35-
- exhaustive
36-
- goconst
37-
- gocritic
38-
- gofmt
39-
- goimports
40-
- gocyclo
41-
- gosec
42-
- gosimple
4311
- govet
12+
- staticcheck
4413
- ineffassign
45-
- misspell
46-
- mnd
47-
- nolintlint
48-
- nakedret
14+
15+
# bug prevention
16+
- copyloopvar
17+
- bodyclose
18+
- exhaustive
19+
- unparam
20+
- unconvert
21+
22+
# code quality
23+
# - gocyclo # TODO: enable later, need to fix complexity issues
24+
- goconst
25+
- revive
4926
- prealloc
5027
- predeclared
51-
- revive
52-
- staticcheck
53-
# - structcheck
54-
- stylecheck
28+
29+
# security
30+
- gosec
31+
32+
# testing
5533
- thelper
5634
- tparallel
57-
- unconvert
58-
- unparam
59-
# - varcheck
35+
36+
# misc
37+
- misspell
6038
- whitespace
61-
- wsl
39+
- nolintlint
40+
- dogsled
41+
42+
settings:
43+
errcheck:
44+
check-type-assertions: true
45+
46+
goconst:
47+
min-len: 2
48+
min-occurrences: 3
49+
50+
gocyclo:
51+
min-complexity: 15
52+
53+
govet:
54+
enable:
55+
- shadow
56+
57+
revive:
58+
severity: warning
59+
60+
nolintlint:
61+
require-explanation: false
62+
require-specific: true
63+
64+
exclusions:
65+
rules:
66+
# Ginkgo/Gomega test suites use dot-imports by convention; suppress the
67+
# revive dot-imports warning for all test files.
68+
- path: '_test\.go'
69+
linters:
70+
- revive
71+
text: 'dot-imports'
6272

6373
issues:
6474
max-issues-per-linter: 0
6575
max-same-issues: 0
66-
fix: true
67-
exclude:
68-
- "cuddle"
69-
70-
run:
71-
issues-exit-code: 1
72-
timeout: "5m"
76+
fix: false

go.mod

Lines changed: 37 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,62 @@
11
module github.com/snivilised/arcadia
22

3-
go 1.23.0
3+
go 1.26.0
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.22.1
7-
github.com/onsi/gomega v1.36.2
6+
github.com/onsi/ginkgo/v2 v2.28.1
7+
github.com/onsi/gomega v1.39.1
88
github.com/pkg/errors v0.9.1
9-
github.com/samber/lo v1.47.0
10-
github.com/snivilised/li18ngo v0.1.9
11-
github.com/snivilised/nefilim v0.1.10
12-
github.com/spf13/cobra v1.8.1
13-
github.com/spf13/viper v1.19.0
14-
go.uber.org/zap v1.27.0
9+
github.com/samber/lo v1.53.0
10+
github.com/snivilised/li18ngo v0.1.10
11+
github.com/snivilised/nefilim v0.1.11
12+
github.com/spf13/cobra v1.10.2
13+
github.com/spf13/viper v1.21.0
14+
go.uber.org/zap v1.27.1
1515
)
1616

1717
require (
18-
github.com/go-logr/logr v1.4.2 // indirect
18+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
19+
github.com/chzyer/readline v1.5.1 // indirect
20+
github.com/go-logr/logr v1.4.3 // indirect
1921
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
20-
github.com/google/go-cmp v0.6.0 // indirect
21-
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
22+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
23+
github.com/google/go-cmp v0.7.0 // indirect
24+
github.com/google/pprof v0.0.0-20260302011040-a15ffb7f9dcc // indirect
25+
github.com/ianlancetaylor/demangle v0.0.0-20251118225945-96ee0021ea0f // indirect
26+
github.com/nxadm/tail v1.4.11 // indirect
2227
github.com/onsi/ginkgo v1.16.5 // indirect
23-
github.com/sagikazarmark/locafero v0.4.0 // indirect
28+
github.com/sagikazarmark/locafero v0.12.0 // indirect
2429
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
25-
github.com/sourcegraph/conc v0.3.0 // indirect
30+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
2631
go.uber.org/multierr v1.11.0 // indirect
27-
golang.org/x/exp v0.0.0-20241009180824-f66d83c29e7c // indirect
28-
golang.org/x/tools v0.28.0 // indirect
32+
go.yaml.in/yaml/v3 v3.0.4 // indirect
33+
golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa // indirect
34+
golang.org/x/mod v0.33.0 // indirect
35+
golang.org/x/sync v0.20.0 // indirect
36+
golang.org/x/tools v0.42.0 // indirect
2937
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
30-
gopkg.in/yaml.v2 v2.3.0 // indirect
38+
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
39+
gopkg.in/yaml.v2 v2.4.0 // indirect
3140
)
3241

3342
require (
3443
github.com/cubiest/jibberjabber v1.0.1
35-
github.com/fsnotify/fsnotify v1.7.0 // indirect
44+
github.com/fsnotify/fsnotify v1.9.0 // indirect
3645
github.com/hashicorp/hcl v1.0.0 // indirect
3746
github.com/inconshreveable/mousetrap v1.1.0 // indirect
38-
github.com/magiconair/properties v1.8.7 // indirect
47+
github.com/magiconair/properties v1.8.10 // indirect
3948
github.com/mitchellh/mapstructure v1.5.0 // indirect
4049
github.com/natefinch/lumberjack v2.0.0+incompatible
41-
github.com/nicksnyder/go-i18n/v2 v2.5.1
42-
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
50+
github.com/nicksnyder/go-i18n/v2 v2.6.1
51+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
4352
github.com/snivilised/cobrass v0.5.0
44-
github.com/spf13/afero v1.11.0 // indirect
45-
github.com/spf13/cast v1.6.0 // indirect
46-
github.com/spf13/pflag v1.0.6
53+
github.com/spf13/afero v1.15.0 // indirect
54+
github.com/spf13/cast v1.10.0 // indirect
55+
github.com/spf13/pflag v1.0.10
4756
github.com/subosito/gotenv v1.6.0 // indirect
48-
golang.org/x/net v0.33.0 // indirect
49-
golang.org/x/sys v0.28.0 // indirect
50-
golang.org/x/text v0.21.0
51-
gopkg.in/ini.v1 v1.67.0 // indirect
57+
golang.org/x/net v0.51.0 // indirect
58+
golang.org/x/sys v0.42.0 // indirect
59+
golang.org/x/text v0.34.0
60+
gopkg.in/ini.v1 v1.67.1 // indirect
5261
gopkg.in/yaml.v3 v3.0.1 // indirect
5362
)

0 commit comments

Comments
 (0)