Skip to content

Commit 9906e57

Browse files
committed
Fix go tools
1 parent f503abc commit 9906e57

File tree

6 files changed

+9
-17
lines changed

6 files changed

+9
-17
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -207,8 +207,8 @@ test: ensuretarget
207207
# Get the go tools
208208
.PHONY: gotools
209209
gotools:
210-
$(GO) get -tool github.com/jstemmer/go-junit-report/v2@latest
211210
$(GO) get -tool go.uber.org/mock/mockgen@latest
211+
$(GO) install github.com/jstemmer/go-junit-report/v2@latest
212212

213213
# Update everything
214214
.PHONY: updateall
@@ -230,7 +230,7 @@ updatelint:
230230

231231
# Update dependencies
232232
.PHONY: updatemod
233-
updatemod:
233+
updatemod: mod
234234
$(GO) get -t -u ./... && \
235235
$(GO) mod tidy -compat=$(shell grep -oP 'go \K[0-9]+\.[0-9]+' go.mod)
236236

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.48
1+
1.0.49

exttools/exttools.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,4 @@ package exttools
99

1010
import (
1111
_ "github.com/golang/mock/mockgen"
12-
_ "github.com/jstemmer/go-junit-report/v2"
1312
)

go.mod

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,13 @@ toolchain go1.25.0
66

77
retract v2.0.6+incompatible // Published in error - v1 is the current version
88

9-
require (
10-
github.com/golang/mock v1.6.0
11-
github.com/jstemmer/go-junit-report/v2 v2.1.0
12-
)
9+
tool go.uber.org/mock/mockgen
10+
11+
require github.com/golang/mock v1.6.0
1312

1413
require (
1514
go.uber.org/mock v0.5.2 // indirect
1615
golang.org/x/mod v0.18.0 // indirect
1716
golang.org/x/sync v0.7.0 // indirect
1817
golang.org/x/tools v0.22.0 // indirect
1918
)
20-
21-
tool (
22-
github.com/jstemmer/go-junit-report/v2
23-
go.uber.org/mock/mockgen
24-
)

go.sum

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
22
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
33
github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
44
github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
5-
github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
65
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
76
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
8-
github.com/jstemmer/go-junit-report/v2 v2.1.0 h1:X3+hPYlSczH9IMIpSC9CQSZA0L+BipYafciZUWHEmsc=
9-
github.com/jstemmer/go-junit-report/v2 v2.1.0/go.mod h1:mgHVr7VUo5Tn8OLVr1cKnLuEy0M92wdRntM99h7RkgQ=
107
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
118
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
129
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

resources/docker/Dockerfile.dev

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
1-
FROM tecnickcom/alldev
1+
FROM golang:1.25
2+
ENV PATH=/root/.local/bin:$PATH
3+
HEALTHCHECK CMD go version || exit 1

0 commit comments

Comments
 (0)