Skip to content

Commit 4729a87

Browse files
djdongjindjdongjin
committed
Upgrade go, dependency, CI versions
Signed-off-by: Jin Dong <[email protected]>
1 parent 644ecfa commit 4729a87

File tree

7 files changed

+46
-61
lines changed

7 files changed

+46
-61
lines changed

‎.github/workflows/ci.yml

+13-24
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
branches: [ main ]
88

99
env:
10-
GO_VERSION: 1.20.x
10+
GO_VERSION: 1.23.x
1111

1212
permissions:
1313
contents: read
@@ -27,27 +27,21 @@ jobs:
2727
os: [ubuntu-latest, macos-latest, windows-latest]
2828

2929
steps:
30-
- uses: actions/checkout@v4
30+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3131
with:
3232
path: src/github.com/containerd/ttrpc
33-
34-
- uses: actions/setup-go@v5
33+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
3534
with:
3635
go-version: ${{ env.GO_VERSION }}
3736

3837
- name: golangci-lint
39-
uses: golangci/golangci-lint-action@v4
38+
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
4039
with:
41-
version: v1.51.2
40+
version: v1.60.3
4241
args: --timeout=5m
4342
skip-cache: true
4443
working-directory: src/github.com/containerd/ttrpc
4544

46-
- name: golangci-lint errors
47-
run: golangci-lint run
48-
working-directory: src/github.com/containerd/ttrpc
49-
if: ${{ failure() }}
50-
5145
#
5246
# Project checks
5347
#
@@ -57,16 +51,15 @@ jobs:
5751
timeout-minutes: 5
5852

5953
steps:
60-
- uses: actions/checkout@v4
54+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
6155
with:
6256
path: src/github.com/containerd/ttrpc
6357
fetch-depth: 25
64-
65-
- uses: actions/setup-go@v5
58+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
6659
with:
6760
go-version: ${{ env.GO_VERSION }}
6861

69-
- uses: containerd/[email protected]
62+
- uses: containerd/project-checks@434a07157608eeaa1d5c8d4dd506154204cd9401 # v1.1.0
7063
with:
7164
working-directory: src/github.com/containerd/ttrpc
7265

@@ -78,20 +71,18 @@ jobs:
7871
fail-fast: false
7972
matrix:
8073
os: [ubuntu-latest, macos-latest, windows-latest]
81-
go: [1.19.x, 1.20.x]
74+
go: [1.22.x, 1.23.x]
8275

8376
name: ${{ matrix.os }} / ${{ matrix.go }}
8477
runs-on: ${{ matrix.os }}
8578
timeout-minutes: 10
8679
steps:
8780

88-
- name: Check out code
89-
uses: actions/checkout@v4
81+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9082
with:
9183
path: src/github.com/containerd/ttrpc
9284
fetch-depth: 25
93-
94-
- uses: actions/setup-go@v5
85+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
9586
with:
9687
go-version: ${{ matrix.go }}
9788

@@ -119,13 +110,11 @@ jobs:
119110
timeout-minutes: 5
120111
steps:
121112

122-
- name: Check out code
123-
uses: actions/checkout@v4
113+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
124114
with:
125115
path: src/github.com/containerd/ttrpc
126116
fetch-depth: 25
127-
128-
- uses: actions/setup-go@v5
117+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
129118
with:
130119
go-version: ${{ env.GO_VERSION }}
131120
id: go

‎.golangci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ linters:
66
- goimports
77
- revive
88
- ineffassign
9-
- vet
9+
- govet
1010
- unused
1111
- misspell
1212
disable:
1313
- errcheck
1414

1515
linters-settings:
1616
revive:
17-
ignore-generated-headers: true
17+
ignore-generated-header: true
1818
rules:
1919
- name: blank-imports
2020
- name: context-as-argument
@@ -45,8 +45,8 @@ linters-settings:
4545
issues:
4646
include:
4747
- EXC0002
48+
exclude-dirs:
49+
- example
4850

4951
run:
5052
timeout: 8m
51-
skip-dirs:
52-
- example

‎go.mod

+7-10
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
module github.com/containerd/ttrpc
22

3-
go 1.19
3+
go 1.22
44

55
require (
66
github.com/containerd/log v0.1.0
77
github.com/gogo/protobuf v1.3.2
8-
github.com/golang/protobuf v1.5.3
8+
github.com/golang/protobuf v1.5.4
99
github.com/prometheus/procfs v0.6.0
10-
golang.org/x/sys v0.18.0
11-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d
12-
google.golang.org/grpc v1.57.1
13-
google.golang.org/protobuf v1.33.0
10+
golang.org/x/sys v0.26.0
11+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38
12+
google.golang.org/grpc v1.69.2
13+
google.golang.org/protobuf v1.36.0
1414
)
1515

16-
require (
17-
github.com/sirupsen/logrus v1.9.3 // indirect
18-
golang.org/x/net v0.23.0 // indirect
19-
)
16+
require github.com/sirupsen/logrus v1.9.3 // indirect

‎go.sum

+17-18
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,11 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
55
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
66
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
77
github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
8-
github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
9-
github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
10-
github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
8+
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
9+
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
1110
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
12-
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
13-
github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38=
11+
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
12+
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
1413
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
1514
github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
1615
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -22,6 +21,7 @@ github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVs
2221
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
2322
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
2423
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
24+
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
2525
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
2626
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
2727
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -33,8 +33,8 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
3333
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
3434
golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
3535
golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
36-
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
37-
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
36+
golang.org/x/net v0.30.0 h1:AcW1SDZMkb8IpzCdQUaIq2sP4sZ4zw+55h6ynffypl4=
37+
golang.org/x/net v0.30.0/go.mod h1:2wGyMJ5iFasEhkwi13ChkO/t1ECNC4X4eBKkVFyYFlU=
3838
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3939
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
4040
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -44,11 +44,12 @@ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7w
4444
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4545
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
4646
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
47-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
48-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
47+
golang.org/x/sys v0.26.0 h1:KHjCJyddX0LoSTb3J+vWpupP9p0oznkqVk/IfjymZbo=
48+
golang.org/x/sys v0.26.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
4949
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
5050
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
51-
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
51+
golang.org/x/text v0.19.0 h1:kTxAhCbGbxhK0IwgSKiMO5awPoDQ0RpfiVYBfK860YM=
52+
golang.org/x/text v0.19.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
5253
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
5354
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
5455
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -57,14 +58,12 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T
5758
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5859
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5960
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
60-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d h1:pgIUhmqwKOUlnKna4r6amKdUngdL8DrkpFeV8+VBElY=
61-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d/go.mod h1:TUfxEVdsvPg18p6AslUXFoLdpED4oBnGwyqk3dV1XzM=
62-
google.golang.org/grpc v1.57.1 h1:upNTNqv0ES+2ZOOqACwVtS3Il8M12/+Hz41RCPzAjQg=
63-
google.golang.org/grpc v1.57.1/go.mod h1:Sd+9RMTACXwmub0zcNY2c4arhtrbBYD1AUHI/dt16Mo=
64-
google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
65-
google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
66-
google.golang.org/protobuf v1.33.0 h1:uNO2rsAINq/JlFpSdYEKIZ0uKD/R9cpdv0T+yoGwGmI=
67-
google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
61+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 h1:zciRKQ4kBpFgpfC5QQCVtnnNAcLIqweL7plyZRQHVpI=
62+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
63+
google.golang.org/grpc v1.69.2 h1:U3S9QEtbXC0bYNvRtcoklF3xGtLViumSYxWykJS+7AU=
64+
google.golang.org/grpc v1.69.2/go.mod h1:vyjdE6jLBI76dgpDojsFGNaHlxdjXN9ghpnd2o7JGZ4=
65+
google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ=
66+
google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
6867
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
6968
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
7069
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

‎interceptor_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
func TestUnaryClientInterceptor(t *testing.T) {
2929
var (
3030
intercepted = false
31-
interceptor = func(ctx context.Context, req *Request, reply *Response, ci *UnaryClientInfo, i Invoker) error {
31+
interceptor = func(ctx context.Context, req *Request, reply *Response, _ *UnaryClientInfo, i Invoker) error {
3232
intercepted = true
3333
return i(ctx, req, reply)
3434
}
@@ -73,7 +73,7 @@ func TestChainUnaryClientInterceptor(t *testing.T) {
7373
orderIdx = 0
7474
recorded = []string{}
7575
intercept = func(idx int, tag string) UnaryClientInterceptor {
76-
return func(ctx context.Context, req *Request, reply *Response, ci *UnaryClientInfo, i Invoker) error {
76+
return func(ctx context.Context, req *Request, reply *Response, _ *UnaryClientInfo, i Invoker) error {
7777
if idx != orderIdx {
7878
t.Fatalf("unexpected interceptor invocation order (%d != %d)", orderIdx, idx)
7979
}

‎server_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func TestServerShutdown(t *testing.T) {
219219

220220
// register a service that takes until we tell it to stop
221221
server.Register(serviceName, map[string]Method{
222-
"Test": func(ctx context.Context, unmarshal func(interface{}) error) (interface{}, error) {
222+
"Test": func(_ context.Context, unmarshal func(interface{}) error) (interface{}, error) {
223223
var req internal.TestPayload
224224
if err := unmarshal(&req); err != nil {
225225
return nil, err

‎stream_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func TestStreamClient(t *testing.T) {
3838

3939
desc := &ServiceDesc{
4040
Methods: map[string]Method{
41-
"Echo": func(ctx context.Context, unmarshal func(interface{}) error) (interface{}, error) {
41+
"Echo": func(_ context.Context, unmarshal func(interface{}) error) (interface{}, error) {
4242
var req internal.EchoPayload
4343
if err := unmarshal(&req); err != nil {
4444
return nil, err
@@ -49,7 +49,7 @@ func TestStreamClient(t *testing.T) {
4949
},
5050
Streams: map[string]Stream{
5151
"EchoStream": {
52-
Handler: func(ctx context.Context, ss StreamServer) (interface{}, error) {
52+
Handler: func(_ context.Context, ss StreamServer) (interface{}, error) {
5353
for {
5454
var req internal.EchoPayload
5555
if err := ss.RecvMsg(&req); err != nil {

0 commit comments

Comments
 (0)