Skip to content

Commit 34e5efb

Browse files
authored
Merge pull request #55 from estesp/update-gha
Update to recent versions in GHA
2 parents d41c7f1 + 89beef7 commit 34e5efb

File tree

4 files changed

+39
-15
lines changed

4 files changed

+39
-15
lines changed

.github/workflows/ci.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ jobs:
1515
steps:
1616

1717
- name: Set up Go
18-
uses: actions/setup-go@v3
18+
uses: actions/setup-go@v5
1919
with:
20-
go-version: 1.19
20+
go-version: 1.24
2121
id: go
2222

2323
- name: Setup Go binary path
@@ -27,7 +27,7 @@ jobs:
2727
echo "${{ github.workspace }}/bin" >> $GITHUB_PATH
2828
2929
- name: Check out code
30-
uses: actions/checkout@v3
30+
uses: actions/checkout@v4
3131
with:
3232
path: src/github.com/containerd/release-tool
3333
fetch-depth: 25
@@ -38,9 +38,9 @@ jobs:
3838
working-directory: src/github.com/containerd/release-tool
3939

4040
- name: Linter
41-
uses: golangci/golangci-lint-action@v3
41+
uses: golangci/golangci-lint-action@v6
4242
with:
43-
version: v1.50.1
43+
version: v1.64.2
4444
working-directory: src/github.com/containerd/release-tool
4545

4646
- name: Unit Test

.golangci.yml

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,42 @@
11
linters:
22
enable:
3-
- staticcheck
4-
- unconvert
3+
- copyloopvar # Checks for loop variable copies in Go 1.22+
54
- gofmt
65
- goimports
7-
- revive
6+
- gosec
87
- ineffassign
9-
- vet
10-
- unused
118
- misspell
12-
- exportloopref
13-
- tenv
9+
- nolintlint
10+
- revive
11+
- staticcheck
12+
- unconvert
13+
- unused
14+
- govet
15+
- dupword # Checks for duplicate words in the source code
1416
disable:
1517
- errcheck
1618

19+
issues:
20+
include:
21+
- EXC0002
22+
max-issues-per-linter: 0
23+
max-same-issues: 0
24+
25+
linters-settings:
26+
gosec:
27+
# The following issues surfaced when `gosec` linter
28+
# was enabled. They are temporarily excluded to unblock
29+
# the existing workflow, but still to be addressed by
30+
# future works.
31+
excludes:
32+
- G204
33+
- G305
34+
- G306
35+
- G402
36+
- G404
37+
- G115
38+
nolintlint:
39+
allow-unused: true
40+
1741
run:
18-
deadline: 2m
42+
timeout: 2m

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/containerd/release-tool
22

3-
go 1.19
3+
go 1.23
44

55
require (
66
github.com/pelletier/go-toml/v2 v2.0.5

util.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ func resolveGitURL(name string, cache Cache) (string, error) {
782782
return string(b), nil
783783
}
784784

785-
resp, err := http.Get(u)
785+
resp, err := http.Get(u) //nolint:gosec
786786
if err != nil {
787787
return "", err
788788
}

0 commit comments

Comments
 (0)