Skip to content

Commit f5bba9c

Browse files
authored
bump to go 1.24, update linter & some dependencies (#233)
1 parent 24fd542 commit f5bba9c

File tree

7 files changed

+48
-42
lines changed

7 files changed

+48
-42
lines changed

.github/workflows/lint.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ jobs:
1919
with:
2020
go-version-file: go.mod
2121
- run: script/install-libtensorflow
22-
- uses: golangci/golangci-lint-action@v6
22+
- uses: golangci/golangci-lint-action@v8
2323
with:
24-
version: v1.61.0
25-
args: --timeout 3m0s
24+
version: v2.1.6

.golangci.yml

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,38 @@
1+
version: "2"
12
run:
23
tests: true
3-
skip-dirs-use-default: true
4-
54
linters:
6-
disable-all: true
7-
# https://golangci-lint.run/usage/linters/
5+
default: none
86
enable:
9-
# rules enabled by default
107
- errcheck
11-
- gosimple
8+
- goconst
9+
- gocritic
10+
- gocyclo
1211
- govet
1312
- ineffassign
13+
- revive
1414
- staticcheck
15-
# - structcheck disabled in 1.18 for now: https://github.com/golangci/golangci-lint/issues/2649
16-
- typecheck
15+
- unconvert
1716
- unused
18-
# additional
19-
- goconst
20-
- gocritic
21-
- gocyclo
17+
exclusions:
18+
generated: lax
19+
presets:
20+
- comments
21+
- common-false-positives
22+
- legacy
23+
- std-error-handling
24+
paths:
25+
- third_party$
26+
- builtin$
27+
- examples$
28+
- internal/timeutil/duration.go
29+
formatters:
30+
enable:
2231
- gofmt
2332
- goimports
24-
- revive
25-
- tenv
26-
- unconvert
33+
exclusions:
34+
generated: lax
35+
paths:
36+
- third_party$
37+
- builtin$
38+
- examples$

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM --platform=${BUILDPLATFORM} golang:1.23 AS build
1+
FROM --platform=${BUILDPLATFORM} golang:1.24 AS build
22

33
ARG TARGETARCH BUILDPLATFORM
44

go.mod

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/robherley/snips.sh
22

3-
go 1.23
4-
5-
toolchain go1.23.1
3+
go 1.24
64

75
require (
86
ariga.io/atlas v0.30.0
@@ -29,7 +27,7 @@ require (
2927
github.com/yuin/goldmark v1.7.8
3028
github.com/yuin/goldmark-emoji v1.0.4
3129
github.com/yuin/goldmark-highlighting/v2 v2.0.0-20220924101305-151362477c87
32-
golang.org/x/crypto v0.32.0
30+
golang.org/x/crypto v0.38.0
3331
)
3432

3533
require (
@@ -77,10 +75,10 @@ require (
7775
github.com/tdewolff/parse/v2 v2.7.19 // indirect
7876
github.com/zclconf/go-cty v1.14.4 // indirect
7977
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
80-
golang.org/x/net v0.34.0 // indirect
81-
golang.org/x/sync v0.10.0 // indirect
82-
golang.org/x/sys v0.29.0 // indirect
83-
golang.org/x/text v0.21.0 // indirect
78+
golang.org/x/net v0.40.0 // indirect
79+
golang.org/x/sync v0.14.0 // indirect
80+
golang.org/x/sys v0.33.0 // indirect
81+
golang.org/x/text v0.25.0 // indirect
8482
google.golang.org/protobuf v1.36.4 // indirect
8583
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect
8684
gopkg.in/yaml.v3 v3.0.1 // indirect

go.sum

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -235,17 +235,23 @@ golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnf
235235
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
236236
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
237237
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
238+
golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
239+
golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
238240
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
239241
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
240242
golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
241243
golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
242244
golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
243245
golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
246+
golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
247+
golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
244248
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
245249
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
246250
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
247251
golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
248252
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
253+
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
254+
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
249255
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
250256
golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
251257
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -257,11 +263,16 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
257263
golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
258264
golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
259265
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
266+
golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
267+
golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
260268
golang.org/x/term v0.28.0 h1:/Ts8HFuMR2E6IP/jlo7QVLZHggjKQbhu/7H0LJFr3Gg=
261269
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
270+
golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
262271
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
263272
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
264273
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
274+
golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
275+
golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
265276
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
266277
google.golang.org/protobuf v1.36.4 h1:6A3ZDJHn/eNqc1i+IdefRzy/9PokBTPvcqMySR7NNIM=
267278
google.golang.org/protobuf v1.36.4/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=

internal/tui/views/browser/table.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -199,17 +199,3 @@ func (bwsr *Browser) preRender() {
199199
bwsr.table.preRendered[i] = row
200200
}
201201
}
202-
203-
func max(a, b int) int {
204-
if a > b {
205-
return a
206-
}
207-
return b
208-
}
209-
210-
func min(a, b int) int {
211-
if a < b {
212-
return a
213-
}
214-
return b
215-
}

script/lint

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
BINDIR="$(git rev-parse --show-toplevel)"/bin
44
BINARY=$BINDIR/golangci-lint
5-
GOLANGCI_LINT_VERSION=v1.61.0
5+
GOLANGCI_LINT_VERSION=v2.1.6
66

77
if [ ! -f "$BINARY" ]; then
88
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s "$GOLANGCI_LINT_VERSION"

0 commit comments

Comments
 (0)