Skip to content

Commit 35bfed0

Browse files
committed
chore: update modules
Update tools and modules to latest versions, addressing dependabot alerts.
1 parent 63e662f commit 35bfed0

File tree

8 files changed

+175
-94
lines changed

8 files changed

+175
-94
lines changed

.github/workflows/go.yml

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,35 +14,32 @@ jobs:
1414
go:
1515
strategy:
1616
matrix:
17-
go: [1.22]
18-
golangci: [v1.61.0]
17+
go: [1.24, 1.24]
18+
golangci: [v2.4.0]
1919
os: [ubuntu-latest, macos-latest, windows-latest]
2020
name: lint
2121
runs-on: ${{ matrix.os }}
2222
steps:
2323
- name: Checkout
24-
uses: actions/checkout@v3
24+
uses: actions/checkout@v5
2525

2626
- name: Setup
27-
uses: actions/setup-go@v4
27+
uses: actions/setup-go@v5
2828
with:
2929
go-version: '${{ matrix.go }}'
3030

3131
- name: Validate go generate / mod
3232
if: runner.os != 'Windows'
3333
run: |
34-
go install golang.org/x/tools/cmd/stringer@latest
3534
go generate ./...
3635
go mod tidy
3736
git --no-pager diff && [[ 0 -eq $(git status --porcelain | wc -l) ]]
3837
3938
- name: Go Lint
40-
uses: golangci/golangci-lint-action@v3
39+
uses: golangci/golangci-lint-action@v8
4140
with:
4241
version: ${{ matrix.golangci }}
43-
args: --out-format=colored-line-number
44-
skip-build-cache: true
45-
skip-pkg-cache: true
42+
skip-cache: true
4643

4744
- name: Go Build
4845
run: go build ./...

.golangci.yml

Lines changed: 75 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,90 @@
1+
version: "2"
12
run:
23
concurrency: 4
3-
timeout: 5m
4-
5-
linters-settings:
6-
gosec:
7-
excludes:
8-
- G104 # Handled by errcheck
9-
gocyclo:
10-
min-complexity: 20
11-
dupl:
12-
threshold: 100
13-
goconst:
14-
min-len: 2
15-
min-occurrences: 4
16-
cyclop:
17-
max-complexity: 15
18-
misspell:
19-
ignore-words:
20-
- ect
21-
ireturn:
22-
allow:
23-
- anon
24-
- error
25-
- empty
26-
- stdlib
27-
- (or|er)$
28-
- tempFile
29-
304
linters:
31-
enable-all: true
5+
default: all
326
disable:
33-
- staticcheck
34-
- varnamelen
35-
- gochecknoglobals
7+
- copyloopvar
8+
# Seems to be broken and just reports all the time.
9+
- depguard
10+
# We're ok with dynamic errors
11+
- err113
12+
- exhaustruct
13+
- forbidigo
3614
- funlen
15+
- gochecknoglobals
3716
- godox
38-
- wsl
17+
- gomoddirectives
18+
- ireturn
3919
- nlreturn
40-
- gomnd
41-
- paralleltest
42-
- wrapcheck
43-
- testpackage
44-
- gofumpt
45-
- forbidigo
46-
- exhaustruct
4720
- nonamedreturns
21+
- paralleltest
22+
- staticcheck
4823
- tagliatelle
49-
- gomoddirectives
50-
- ireturn
51-
# Deprecated
52-
- exportloopref
53-
- execinquery
54-
- copyloopvar
55-
# Seems to be broken and just reports all the time.
56-
- depguard
24+
- testpackage
25+
- varnamelen
26+
- wrapcheck
27+
- wsl
28+
- wsl_v5
5729
# Lots of noise
5830
- mnd
5931
- musttag
60-
# We're ok with dynamic errors
61-
- err113
32+
# We prefer inline errors, and fix results in broken code.
33+
- noinlineerr
34+
# Noisy with types which extend time.Time
35+
- recvcheck
36+
# No real value for consumers as only exports methods are documented.
37+
- funcorder
38+
# Can result in increased struct size.
39+
- embeddedstructfieldcheck
40+
# Needs API changes.
41+
- noctx
6242

43+
settings:
44+
cyclop:
45+
max-complexity: 15
46+
dupl:
47+
threshold: 100
48+
goconst:
49+
min-len: 2
50+
min-occurrences: 4
51+
gocyclo:
52+
min-complexity: 20
53+
gosec:
54+
excludes:
55+
- G104
56+
ireturn:
57+
allow:
58+
- anon
59+
- error
60+
- empty
61+
- stdlib
62+
- (or|er)$
63+
- tempFile
64+
misspell:
65+
ignore-rules:
66+
- ect
67+
exclusions:
68+
generated: lax
69+
rules:
70+
- path: (.+)\.go$
71+
text: .*Duplicate words \(.\.\) found.*
72+
- path: (.+)\.go$
73+
text: ^Error return value of `fmt\.\w+` is not checked.*
74+
paths:
75+
- third_party$
76+
- builtin$
77+
- examples$
6378
issues:
64-
exclude:
65-
- .*Duplicate words \(.\.\) found.*
66-
- ^Error return value of `fmt\.\w+` is not checked.*
67-
exclude-use-default: false
6879
max-same-issues: 0
80+
formatters:
81+
enable:
82+
- gci
83+
- gofmt
84+
- goimports
85+
exclusions:
86+
generated: lax
87+
paths:
88+
- third_party$
89+
- builtin$
90+
- examples$

go.mod

Lines changed: 31 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,59 @@
11
module github.com/stevenh/tracktools
22

3-
go 1.22.0
4-
5-
toolchain go1.23.4
3+
go 1.24.0
64

75
require (
8-
github.com/Eyevinn/mp4ff v0.47.0
9-
github.com/flopp/go-staticmaps v0.0.0-20240606055734-0bdd9c1c1478
10-
github.com/golang/geo v0.0.0-20230421003525-6adc56603217
6+
github.com/Eyevinn/mp4ff v0.49.0
7+
github.com/flopp/go-staticmaps v0.0.0-20250629121348-973b17999e19
8+
github.com/golang/geo v0.0.0-20250825151631-54d70cc7cb31
119
github.com/mitchellh/go-homedir v1.1.0
1210
github.com/mitchellh/mapstructure v1.5.0
13-
github.com/rs/zerolog v1.33.0
14-
github.com/spf13/cobra v1.8.1
15-
github.com/spf13/pflag v1.0.5
16-
github.com/spf13/viper v1.19.0
17-
github.com/stretchr/testify v1.10.0
11+
github.com/rs/zerolog v1.34.0
12+
github.com/spf13/cobra v1.9.1
13+
github.com/spf13/pflag v1.0.7
14+
github.com/spf13/viper v1.20.1
15+
github.com/stretchr/testify v1.11.0
1816
github.com/tidwall/geodesic v1.52.4
19-
golang.org/x/text v0.21.0
20-
gonum.org/v1/gonum v0.15.1
17+
golang.org/x/text v0.28.0
18+
gonum.org/v1/gonum v0.16.0
2119
)
2220

2321
require (
24-
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
22+
github.com/cpuguy83/go-md2man/v2 v2.0.7 // indirect
2523
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/flopp/go-coordsparser v0.0.0-20240403152942-4891dc40d0a7 // indirect
24+
github.com/flopp/go-coordsparser v0.0.0-20250311184423-61a7ff62d17c // indirect
2725
github.com/fogleman/gg v1.3.0 // indirect
28-
github.com/fsnotify/fsnotify v1.8.0 // indirect
26+
github.com/fsnotify/fsnotify v1.9.0 // indirect
27+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
2928
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
3029
github.com/hashicorp/hcl v1.0.0 // indirect
3130
github.com/inconshreveable/mousetrap v1.1.0 // indirect
32-
github.com/magiconair/properties v1.8.9 // indirect
31+
github.com/magiconair/properties v1.8.10 // indirect
3332
github.com/mattn/go-colorable v0.1.14 // indirect
3433
github.com/mattn/go-isatty v0.0.20 // indirect
35-
github.com/mazznoer/csscolorparser v0.1.5 // indirect
36-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
34+
github.com/mazznoer/csscolorparser v0.1.6 // indirect
35+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
3736
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3837
github.com/russross/blackfriday/v2 v2.1.0 // indirect
39-
github.com/sagikazarmark/locafero v0.7.0 // indirect
38+
github.com/sagikazarmark/locafero v0.10.0 // indirect
4039
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
41-
github.com/sourcegraph/conc v0.3.0 // indirect
42-
github.com/spf13/afero v1.12.0 // indirect
43-
github.com/spf13/cast v1.7.1 // indirect
40+
github.com/sourcegraph/conc v0.3.1-0.20240121214520-5f936abd7ae8 // indirect
41+
github.com/spf13/afero v1.14.0 // indirect
42+
github.com/spf13/cast v1.9.2 // indirect
4443
github.com/subosito/gotenv v1.6.0 // indirect
4544
github.com/tkrajina/gpxgo v1.4.0 // indirect
4645
go.uber.org/multierr v1.11.0 // indirect
47-
golang.org/x/exp v0.0.0-20250106191152-7588d65b2ba8 // indirect
48-
golang.org/x/image v0.23.0 // indirect
49-
golang.org/x/net v0.34.0 // indirect
50-
golang.org/x/sys v0.29.0 // indirect
46+
golang.org/x/exp v0.0.0-20250819193227-8b4c13bb791b // indirect
47+
golang.org/x/image v0.30.0 // indirect
48+
golang.org/x/mod v0.27.0 // indirect
49+
golang.org/x/net v0.43.0 // indirect
50+
golang.org/x/sync v0.16.0 // indirect
51+
golang.org/x/sys v0.35.0 // indirect
52+
golang.org/x/tools v0.36.0 // indirect
5153
gopkg.in/ini.v1 v1.67.0 // indirect
5254
gopkg.in/yaml.v3 v3.0.1 // indirect
5355
)
5456

5557
replace github.com/tidwall/geodesic => github.com/stevenh/geodesic v0.3.6-0.20220704191314-6615b5611b07
58+
59+
tool golang.org/x/tools/cmd/stringer

0 commit comments

Comments
 (0)