Skip to content

Commit c9d35e4

Browse files
authored
Merge pull request #3936 from cpanato/updates
use go1.24 and remove deprecated lint
2 parents 92585e5 + 02a7590 commit c9d35e4

File tree

7 files changed

+8
-9
lines changed

7 files changed

+8
-9
lines changed

.github/workflows/lint.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ jobs:
1919
id: go
2020
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2121
with:
22-
go-version: '1.23'
22+
go-version: '1.24'
2323
check-latest: true
2424

2525
- name: golangci-lint
2626
uses: golangci/golangci-lint-action@2226d7cb06a077cd73e56eedd38eecad18e5d837 # v6.5.0
2727
with:
28-
version: v1.63
28+
version: v1.64

.github/workflows/release.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
id: go
3333
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3434
with:
35-
go-version: '1.23'
35+
go-version: '1.24'
3636
check-latest: true
3737

3838
- uses: sigstore/cosign-installer@d7d6bc7722e3daa8354c50bcb52f4837da5e9b6a # v3.8.1

.github/workflows/snapshot.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
id: go
2727
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2828
with:
29-
go-version: '1.23'
29+
go-version: '1.24'
3030
check-latest: true
3131

3232
- name: Install bom

.golangci.yml

-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ linters:
8383
- staticcheck
8484
- stylecheck
8585
- tagalign
86-
- tenv
8786
- testableexamples
8887
- testifylint
8988
- tparallel

cmd/krel/cmd/sut_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func newSUT(t *testing.T) *sut {
4949
// global .gitconfig. This means we're silently assuming that we're running
5050
// inside a container with the actual $HOME of `/root`.
5151
if !env.IsSet("HOME") {
52-
os.Setenv("HOME", "/root")
52+
t.Setenv("HOME", "/root")
5353
}
5454

5555
// A local k/k repo will be our test base

dependencies.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ dependencies:
7070
# match: "GO_VERSION: '\\d+.\\d+(alpha|beta|rc)?\\.?(\\d+)?'"
7171

7272
- name: "golang: 1.<major> (github workflows)"
73-
version: 1.23
73+
version: 1.24
7474
refPaths:
7575
- path: .github/workflows/release.yml
7676
match: "go-version: '\\d+.\\d+'"
@@ -459,7 +459,7 @@ dependencies:
459459

460460
# golangci-lint-version
461461
- name: "golangci-lint"
462-
version: v1.63
462+
version: v1.64
463463
refPaths:
464464
- path: .github/workflows/lint.yml
465465
match: "version: v\\d+.\\d+?\\.?(\\d+)?"

pkg/release/release_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func TestGetToolRefSuccess(t *testing.T) {
5252

5353
for _, tc := range testcases {
5454
t.Logf("Test case: %s", tc.name)
55-
require.NoError(t, os.Setenv("TOOL_REF", tc.ref))
55+
t.Setenv("TOOL_REF", tc.ref)
5656

5757
actual := GetToolRef()
5858
require.Equal(t, tc.expected, actual)

0 commit comments

Comments
 (0)