Skip to content

Commit d33a831

Browse files
committed
Go 1.24
AB#10383 Fixes AB#10743 Signed-off-by: Paul Hewlett <phewlett76@gmail.com>
1 parent d1c612d commit d33a831

File tree

10 files changed

+111
-84
lines changed

10 files changed

+111
-84
lines changed

.env.tools

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
export TOOLS_BUILDNUMBER=20250121.2
2-
1+
export TOOLS_BUILDNUMBER=20250415.2

.github/dependabot.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,3 @@ updates:
1010
day: "tuesday"
1111
time: "03:23"
1212
timezone: "Europe/London"
13-
14-
# Maintain dependencies for go.mod
15-
- package-ecosystem: "gomod"
16-
directory: "/"
17-
schedule:
18-
interval: "weekly"
19-
day: "tuesday"
20-
time: "03:24"
21-
timezone: "Europe/London"
22-

.github/workflows/push.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ jobs:
1313
- uses: actions/checkout@v4
1414
- uses: actions/setup-go@v5
1515
with:
16-
go-version: '1.23'
16+
go-version: '1.24'
1717
cache: false
1818

1919
- name: Install Go quality tools
2020
run: |
2121
go install golang.org/x/tools/cmd/goimports@v0.1.7
2222
go install github.com/axw/gocov/gocov@v1.1.0
2323
go install github.com/jstemmer/go-junit-report/v2@v2.1.0
24-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.60.3
24+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.64.2
2525
2626
- name: Install Task
2727
uses: arduino/setup-task@v2
@@ -31,17 +31,19 @@ jobs:
3131

3232
- name: Code quality checks
3333
run: |
34-
# Note: it is by design that we don't use the builder
3534
task format
3635
task lint
3736
3837
# If this produces any output, its will error. Formatting and linting changes should have
3938
# been committed already.
4039
git diff
4140
41+
- name: Vulnerability check
42+
run: |
43+
task vulncheck
44+
4245
- name: Unit tests
4346
run: |
44-
# Note: it is by design that we don't use the builder
4547
task test:unit
4648
4749
- name: Integration tests

.golangci.yml

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,26 @@ linters-settings:
5555
# Default: false
5656
explicit-exhaustive-map: false
5757
gci:
58-
local-prefixes: github.com/datatrails/go-datatrails-merklelog
58+
# Section configuration to compare against.
59+
# Section names are case-insensitive and may contain parameters in ().
60+
# The default order of sections is `standard > default > custom > blank > dot > alias > localmodule`,
61+
# If `custom-order` is `true`, it follows the order of `sections` option.
62+
# Default: ["standard", "default"]
63+
sections:
64+
- standard # Standard section: captures all standard packages.
65+
- default # Default section: contains all imports that could not be matched to another section type.
66+
- prefix(github.com/datatrails/avid) # Custom section: groups all imports with the specified Prefix.
67+
- blank # Blank section: contains all blank imports. This section is not present unless explicitly enabled.
68+
- dot # Dot section: contains all dot imports. This section is not present unless explicitly enabled.
69+
- alias # Alias section: contains all alias imports. This section is not present unless explicitly enabled.
70+
- localmodule # Local module section: contains all local packages. This section is not present unless explicitly enabled.
71+
# Skip generated files.
72+
# Default: true
73+
skip-generated: false
74+
# Enable custom order of sections.
75+
# If `true`, make the section order the same as the order of `sections`.
76+
# Default: false
77+
custom-order: true
5978
goconst:
6079
min-len: 2
6180
min-occurrences: 2
@@ -72,16 +91,16 @@ linters-settings:
7291
min-complexity: 10
7392
goimports:
7493
local-prefixes: github.com/golangci/golangci-lint
75-
golint:
76-
min-confidence: 0
7794
govet:
78-
check-shadowing: true
95+
enable-all: true
96+
disable:
97+
- fieldalignment
7998
settings:
8099
printf:
81100
funcs:
82101
- Infof
83-
- Warnf
84-
- Errorf
102+
- Debugf
103+
- Panicf
85104
- Fatalf
86105
lll:
87106
line-length: 500
@@ -99,8 +118,6 @@ linters-settings:
99118
# goconst - see ticket #3097
100119
# goerr113 - disabled see https://github.com/Djarvur/go-err113/issues/10
101120
# gofumpt - not useful - confusing messages
102-
# gomnd - see ticket #3116
103-
# govet - see ticket #3117
104121
# nilreturn onwardis not yet evaluated...
105122
# maligned - this guards against performance issues due to accessing
106123
# mis-aligned structs. We don't have direct evidence of this being a
@@ -118,17 +135,17 @@ linters-settings:
118135
linters:
119136
enable-all: true
120137
disable:
138+
- canonicalheader
121139
- containedctx
122140
- contextcheck
123141
- cyclop
124-
- deadcode
125142
- depguard
126143
- dupl
127144
- dupword
128145
- durationcheck
146+
- err113
129147
- errchkjson
130148
- errname
131-
- exhaustivestruct
132149
- exhaustruct
133150
- forbidigo
134151
- forcetypeassert
@@ -141,22 +158,16 @@ linters:
141158
- gocyclo
142159
- godot
143160
- godox
144-
- goerr113
145161
- gofumpt
146-
- golint
147162
- gomoddirectives
148-
- gomnd
149163
- gosec
150164
- gosimple
151-
- ifshort
152165
- inamedparam
153-
- interfacer
154166
- interfacebloat
155167
- ireturn
156-
- maligned
157168
- maintidx
158-
- mnd
159169
- misspell
170+
- mnd
160171
- musttag
161172
- nilerr
162173
- nilnil
@@ -165,16 +176,13 @@ linters:
165176
- nestif
166177
- nolintlint
167178
- nonamedreturns
168-
- nosnakecase
169179
- nosprintfhostport
170180
- paralleltest
171181
- perfsprint
172182
- prealloc
173183
- protogetter
174184
- revive
175185
- rowserrcheck
176-
- scopelint
177-
- structcheck
178186
- stylecheck
179187
- tagalign
180188
- tagliatelle
@@ -186,7 +194,6 @@ linters:
186194
- unparam
187195
- unused
188196
- usestdlibvars
189-
- varcheck
190197
- varnamelen
191198
- wastedassign
192199
- whitespace

Taskfile.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,11 @@ tasks:
4646
cmds:
4747
- task: codequality:lint
4848

49+
vulncheck:
50+
desc: vulnerability check
51+
cmds:
52+
- task: codequality:vulncheck
53+
4954
go:modules:
5055
desc: tidies the go modules
5156
cmds:
@@ -60,4 +65,4 @@ tasks:
6065
desc: run the unit tests
6166
cmds:
6267
- task: azurite:preflight
63-
- task: gotest:go:azurite
68+
- task: gotest:go:azurite

go.mod

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/datatrails/go-datatrails-logverification
22

3-
go 1.23.0
3+
go 1.24
44

55
require (
6-
github.com/datatrails/go-datatrails-common v0.28.0
7-
github.com/datatrails/go-datatrails-common-api-gen v0.7.0
8-
github.com/datatrails/go-datatrails-merklelog/massifs v0.6.0
9-
github.com/datatrails/go-datatrails-merklelog/mmr v0.4.0
10-
github.com/datatrails/go-datatrails-merklelog/mmrtesting v0.4.0
6+
github.com/datatrails/go-datatrails-common v0.30.0
7+
github.com/datatrails/go-datatrails-common-api-gen v0.8.0
8+
github.com/datatrails/go-datatrails-merklelog/massifs v0.6.1
9+
github.com/datatrails/go-datatrails-merklelog/mmr v0.4.1
10+
github.com/datatrails/go-datatrails-merklelog/mmrtesting v0.4.1
1111
github.com/datatrails/go-datatrails-serialization/eventsv1 v0.0.2
12-
github.com/datatrails/go-datatrails-simplehash v0.0.5
12+
github.com/datatrails/go-datatrails-simplehash v0.2.0
1313
github.com/google/uuid v1.6.0
1414
github.com/stretchr/testify v1.10.0
1515
github.com/veraison/go-cose v1.1.0
@@ -19,7 +19,7 @@ require (
1919
require (
2020
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
2121
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0 // indirect
22-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.7.0 // indirect
22+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.2 // indirect
2323
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
2424
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.4.1 // indirect
2525
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
@@ -32,7 +32,7 @@ require (
3232
github.com/Azure/go-autorest/autorest/validation v0.3.1 // indirect
3333
github.com/Azure/go-autorest/logger v0.2.1 // indirect
3434
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
35-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
35+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.3 // indirect
3636
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3737
github.com/dimchansky/utfbom v1.1.1 // indirect
3838
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
@@ -50,10 +50,10 @@ require (
5050
github.com/zeebo/bencode v1.0.0 // indirect
5151
go.uber.org/multierr v1.11.0 // indirect
5252
go.uber.org/zap v1.27.0 // indirect
53-
golang.org/x/crypto v0.35.0 // indirect
54-
golang.org/x/net v0.36.0 // indirect
55-
golang.org/x/sys v0.30.0 // indirect
56-
golang.org/x/text v0.22.0 // indirect
53+
golang.org/x/crypto v0.36.0 // indirect
54+
golang.org/x/net v0.38.0 // indirect
55+
golang.org/x/sys v0.31.0 // indirect
56+
golang.org/x/text v0.23.0 // indirect
5757
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 // indirect
5858
google.golang.org/genproto/googleapis/rpc v0.0.0-20250115164207-1a7da9e5054f // indirect
5959
google.golang.org/grpc v1.71.1 // indirect

0 commit comments

Comments
 (0)