Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit a94e4ac

Browse files
committedApr 4, 2025
Upgrade to go 1.24
Fix new linter failures AB#10383 Signed-off-by: Paul Hewlett <phewlett76@gmail.com>
1 parent aeed9be commit a94e4ac

File tree

6 files changed

+30
-17
lines changed

6 files changed

+30
-17
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=20241108.3
2-
1+
export TOOLS_BUILDNUMBER=20250403.6

‎.github/workflows/push.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ jobs:
1010
- uses: actions/checkout@v4
1111
- uses: actions/setup-go@v5
1212
with:
13-
go-version: '1.23'
13+
go-version: '1.24'
1414
cache: false
1515
- name: Check formatting
1616
uses: Jerome1337/gofmt-action@v1.0.5
@@ -30,7 +30,7 @@ jobs:
3030
# Require: The version of golangci-lint to use.
3131
# When `install-mode` is `binary` (default) the value can be v1.2 or v1.2.3 or `latest` to use the latest version.
3232
# When `install-mode` is `goinstall` the value can be v1.2.3, `latest`, or the hash of a commit.
33-
version: v1.60
33+
version: v1.64.2
3434
- name: Install Task
3535
uses: arduino/setup-task@v2
3636
with:

‎.golangci.yml

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@ linters-settings:
8686
goimports:
8787
local-prefixes: github.com/golangci/golangci-lint
8888
govet:
89+
enable-all: true
90+
disable:
91+
- fieldalignment
8992
settings:
9093
printf:
9194
funcs:
@@ -107,8 +110,6 @@ linters-settings:
107110
# goconst - see ticket #3097
108111
# goerr113 - disabled see https://github.com/Djarvur/go-err113/issues/10
109112
# gofumpt - not useful - confusing messages
110-
# gomnd - see ticket #3116
111-
# govet - see ticket #3117
112113
# nilreturn onwardis not yet evaluated...
113114
# misspell - expected UK spelling with misspell, but customer facing text needs to be US.
114115
# tagalign - suppress until we can get a golang code formatter that will fix this (cosmetic)
@@ -130,9 +131,7 @@ linters:
130131
- err113
131132
- errchkjson
132133
- errname
133-
- execinquery
134134
- exhaustruct
135-
- exportloopref
136135
- forbidigo
137136
- forcetypeassert
138137
# DONT re-enable funlen please
@@ -146,7 +145,6 @@ linters:
146145
- godox
147146
- gofumpt
148147
- gomoddirectives
149-
- gomnd
150148
- gosec
151149
- gosimple
152150
- inamedparam

‎azblob/download.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ func (azp *Storer) Reader(
119119
return nil, metadataErr
120120
}
121121
if parseErr := readerResponseMetadata(resp, metaData); parseErr != nil {
122-
return nil, err
122+
return nil, parseErr
123123
}
124124
}
125125

‎go.mod

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

3-
go 1.23.0
3+
go 1.24
44

55
require (
66
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
@@ -20,7 +20,7 @@ require (
2020
github.com/stretchr/testify v1.10.0
2121
github.com/veraison/go-cose v1.1.0
2222
go.uber.org/zap v1.27.0
23-
google.golang.org/grpc v1.69.0-dev
23+
google.golang.org/grpc v1.70.0
2424
)
2525

2626
require (
@@ -56,6 +56,6 @@ require (
5656
golang.org/x/net v0.34.0 // indirect
5757
golang.org/x/sys v0.29.0 // indirect
5858
golang.org/x/text v0.21.0 // indirect
59-
google.golang.org/protobuf v1.35.2 // indirect
59+
google.golang.org/protobuf v1.36.6 // indirect
6060
gopkg.in/yaml.v3 v3.0.1 // indirect
6161
)

‎go.sum

Lines changed: 20 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)
Please sign in to comment.