Skip to content

Commit 63e662f

Browse files
authored
chore: update versions (#29)
Update all modules, go and golangci-lint. This addresses security issues with x/net.
1 parent 5ef316b commit 63e662f

File tree

18 files changed

+167
-584
lines changed

18 files changed

+167
-584
lines changed

.github/workflows/go.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ jobs:
1414
go:
1515
strategy:
1616
matrix:
17-
go: [1.19]
18-
golangci: [v1.55.1]
17+
go: [1.22]
18+
golangci: [v1.61.0]
1919
os: [ubuntu-latest, macos-latest, windows-latest]
2020
name: lint
2121
runs-on: ${{ matrix.os }}

.golangci.yml

Lines changed: 14 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
run:
22
concurrency: 4
3-
deadline: 5m
3+
timeout: 5m
44

55
linters-settings:
6-
govet:
7-
check-shadowing: false
6+
gosec:
7+
excludes:
8+
- G104 # Handled by errcheck
89
gocyclo:
910
min-complexity: 20
10-
maligned:
11-
suggest-new: true
1211
dupl:
1312
threshold: 100
1413
goconst:
@@ -31,42 +30,39 @@ linters-settings:
3130
linters:
3231
enable-all: true
3332
disable:
34-
- interfacer
35-
- gas
36-
- megacheck
37-
- structcheck
3833
- staticcheck
3934
- varnamelen
4035
- gochecknoglobals
41-
- scopelint
4236
- funlen
4337
- godox
44-
- exhaustivestruct
45-
- goerr113
4638
- wsl
4739
- nlreturn
4840
- gomnd
4941
- paralleltest
5042
- wrapcheck
5143
- testpackage
52-
- golint
53-
- maligned
5444
- gofumpt
5545
- forbidigo
5646
- exhaustruct
5747
- nonamedreturns
5848
- tagliatelle
5949
- gomoddirectives
60-
- ifshort
6150
- ireturn
62-
- nosnakecase
63-
- deadcode
64-
- varcheck
51+
# Deprecated
52+
- exportloopref
53+
- execinquery
54+
- copyloopvar
6555
# Seems to be broken and just reports all the time.
6656
- depguard
57+
# Lots of noise
58+
- mnd
59+
- musttag
60+
# We're ok with dynamic errors
61+
- err113
6762

6863
issues:
6964
exclude:
7065
- .*Duplicate words \(.\.\) found.*
66+
- ^Error return value of `fmt\.\w+` is not checked.*
7167
exclude-use-default: false
7268
max-same-issues: 0

cmd/tracktools/cmd/gopro_laptimes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func (c *goproLapTimesCmd) RunE(cmd *cobra.Command, args []string) error {
3838
}
3939

4040
func (c *goproLapTimesCmd) process(dec *gpmf.Decoder, file string) error {
41-
f, err := os.Open(file)
41+
f, err := os.Open(file) //nolint: gosec // Yes it is.
4242
if err != nil {
4343
return fmt.Errorf("laptimes: open %w", err)
4444
}

go.mod

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,46 +1,53 @@
11
module github.com/stevenh/tracktools
22

3-
go 1.18
3+
go 1.22.0
4+
5+
toolchain go1.23.4
46

57
require (
6-
github.com/Eyevinn/mp4ff v0.33.2
7-
github.com/flopp/go-staticmaps v0.0.0-20220221183018-c226716bec53
8-
github.com/golang/geo v0.0.0-20210211234256-740aa86cb551
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
911
github.com/mitchellh/go-homedir v1.1.0
1012
github.com/mitchellh/mapstructure v1.5.0
11-
github.com/rs/zerolog v1.29.0
12-
github.com/spf13/cobra v1.6.1
13+
github.com/rs/zerolog v1.33.0
14+
github.com/spf13/cobra v1.8.1
1315
github.com/spf13/pflag v1.0.5
14-
github.com/spf13/viper v1.15.0
15-
github.com/stretchr/testify v1.8.2
16-
github.com/tidwall/geodesic v0.3.5
17-
golang.org/x/text v0.16.0
18-
gonum.org/v1/gonum v0.12.0
16+
github.com/spf13/viper v1.19.0
17+
github.com/stretchr/testify v1.10.0
18+
github.com/tidwall/geodesic v1.52.4
19+
golang.org/x/text v0.21.0
20+
gonum.org/v1/gonum v0.15.1
1921
)
2022

2123
require (
22-
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
23-
github.com/davecgh/go-spew v1.1.1 // indirect
24-
github.com/flopp/go-coordsparser v0.0.0-20201115094714-8baaeb7062d5 // indirect
24+
github.com/cpuguy83/go-md2man/v2 v2.0.6 // indirect
25+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26+
github.com/flopp/go-coordsparser v0.0.0-20240403152942-4891dc40d0a7 // indirect
2527
github.com/fogleman/gg v1.3.0 // indirect
26-
github.com/fsnotify/fsnotify v1.6.0 // indirect
28+
github.com/fsnotify/fsnotify v1.8.0 // indirect
2729
github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 // indirect
2830
github.com/hashicorp/hcl v1.0.0 // indirect
2931
github.com/inconshreveable/mousetrap v1.1.0 // indirect
30-
github.com/magiconair/properties v1.8.7 // indirect
31-
github.com/mattn/go-colorable v0.1.13 // indirect
32-
github.com/mattn/go-isatty v0.0.17 // indirect
33-
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
34-
github.com/pmezard/go-difflib v1.0.0 // indirect
32+
github.com/magiconair/properties v1.8.9 // indirect
33+
github.com/mattn/go-colorable v0.1.14 // indirect
34+
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
37+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3538
github.com/russross/blackfriday/v2 v2.1.0 // indirect
36-
github.com/spf13/afero v1.9.4 // indirect
37-
github.com/spf13/cast v1.5.0 // indirect
38-
github.com/spf13/jwalterweatherman v1.1.0 // indirect
39-
github.com/subosito/gotenv v1.4.2 // indirect
40-
github.com/tkrajina/gpxgo v1.2.1 // indirect
41-
golang.org/x/image v0.18.0 // indirect
42-
golang.org/x/net v0.23.0 // indirect
43-
golang.org/x/sys v0.18.0 // indirect
39+
github.com/sagikazarmark/locafero v0.7.0 // indirect
40+
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
44+
github.com/subosito/gotenv v1.6.0 // indirect
45+
github.com/tkrajina/gpxgo v1.4.0 // indirect
46+
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
4451
gopkg.in/ini.v1 v1.67.0 // indirect
4552
gopkg.in/yaml.v3 v3.0.1 // indirect
4653
)

0 commit comments

Comments
 (0)