Skip to content

Commit 4d6434e

Browse files
authored
Merge pull request #4 from cybozu-go/support-golang-1.24
Update CI workflow and dependencies to Go 1.24 and x tools v0.31.0
2 parents 1c07efd + daf2acc commit 4d6434e

File tree

4 files changed

+19
-11
lines changed

4 files changed

+19
-11
lines changed

.github/workflows/ci.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
name: Tests
1010
runs-on: ubuntu-22.04
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-go@v4
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-go@v5
1414
with:
1515
go-version-file: ./go.mod
1616
- run: make setup

go.mod

+8-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
module github.com/cybozu-go/golang-custom-analyzer
22

3-
go 1.20
3+
go 1.22.0
44

5-
require golang.org/x/tools v0.19.0
5+
toolchain go1.24.0
66

7-
require golang.org/x/mod v0.16.0 // indirect
7+
require golang.org/x/tools v0.30.0
8+
9+
require (
10+
golang.org/x/mod v0.23.0 // indirect
11+
golang.org/x/sync v0.11.0 // indirect
12+
)

go.sum

+8-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
1-
golang.org/x/mod v0.16.0 h1:QX4fJ0Rr5cPQCF7O9lh9Se4pmwfwskqZfq5moyldzic=
2-
golang.org/x/mod v0.16.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
3-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
4-
golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
5-
golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=
1+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
2+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
3+
golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
4+
golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
5+
golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
6+
golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
7+
golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
8+
golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=

pkg/restrictpkg/restrictpkg.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ func run(pass *analysis.Pass) (interface{}, error) {
4747
}
4848
for _, p := range packages {
4949
if n.Path.Value == fmt.Sprintf(`"%s"`, p) {
50-
pass.Reportf(n.Pos(), fmt.Sprintf("%s package must not be imported", p))
50+
pass.Reportf(n.Pos(), "%s package must not be imported", p)
5151
}
5252
}
5353
}

0 commit comments

Comments
 (0)