Skip to content

Commit 06ca374

Browse files
authored
Update the go version to 1.25
1 parent feb206c commit 06ca374

File tree

16 files changed

+82
-85
lines changed

16 files changed

+82
-85
lines changed

.github/workflows/github-actions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: checks
22
env:
3-
GO_VERSION: '1.24'
3+
GO_VERSION: '1.25'
44
on:
55
pull_request:
66
branches:
@@ -43,7 +43,7 @@ jobs:
4343
- name: golangci-lint
4444
# Switch back to the official action after this bug is fixed: https://github.com/golangci/golangci-lint/issues/3107
4545
run: |
46-
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.1.6
46+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v2.6.0
4747
$(go env GOPATH)/bin/golangci-lint run --output.text.path=github-actions --timeout=15m --verbose
4848
go-mod-tidy:
4949
name: go mod tidy

.golangci.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
version: "2"
22
run:
3-
go: "1.24"
3+
go: "1.25"
44
linters:
55
default: none
66
enable:
77
- errcheck
88
- gosec
99
- govet
10+
- nakedret
1011
settings:
1112
gosec:
1213
excludes:
@@ -15,6 +16,8 @@ linters:
1516
govet:
1617
disable:
1718
- printf
19+
nakedret:
20+
max-func-lines: 60
1821
lll:
1922
line-length: 120
2023
tab-width: 4
@@ -41,12 +44,8 @@ linters:
4144
- examples$
4245
formatters:
4346
enable:
44-
- gofumpt
4547
- goimports
4648
settings:
47-
gofumpt:
48-
module-path: github.com/netapp/trident
49-
extra-rules: true
5049
goimports:
5150
local-prefixes:
5251
- github.com/netapp/trident

BUILD.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44

55
### Single-Platform (Linux)
66

7-
* Docker-compatible container cli, such as nerdctl or docker
8-
* Make, if not building natively or with linker flags
9-
* Go 1.24 or greater, to optionally build Trident natively
7+
- Docker-compatible container cli, such as nerdctl or docker
8+
- Make, if not building natively or with linker flags
9+
- Go 1.25 or greater, to optionally build Trident natively
1010

1111
### Multi-Platform
1212

13-
* Make
14-
* Docker
15-
* Go 1.24 or greater, to optionally build Trident binaries natively
16-
* jq
13+
- Make
14+
- Docker
15+
- Go 1.25 or greater, to optionally build Trident binaries natively
16+
- jq
1717

1818
## Makefile Parameters
1919

@@ -32,7 +32,7 @@ Container registry used to tag images and manifests, and optionally to push imag
3232

3333
`GO_IMAGE`
3434

35-
Default: `golang:1.24`
35+
Default: `golang:1.25`
3636

3737
Container image used by default `$GO_SHELL` to run binary build scripts.
3838

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ REGISTRY ?= $(DEFAULT_REGISTRY)
1414
BUILDX_OUTPUT ?= load
1515

1616
# GO_IMAGE golang image used in default GO_SHELL
17-
GO_IMAGE ?= golang:1.24
17+
GO_IMAGE ?= golang:1.25
1818

1919
# GO_CMD go command used for go build
2020
GO_CMD ?= go

chwrap/chwrap.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright 2022 NetApp, Inc. All Rights Reserved.
22

33
//go:build !windows
4-
// +build !windows
54

65
package main
76

0 commit comments

Comments
 (0)