Skip to content

Commit 2d46141

Browse files
committed
upgrade golang, deps, CI versions
Signed-off-by: Jin Dong <[email protected]>
1 parent 64922e7 commit 2d46141

5 files changed

Lines changed: 81 additions & 3482 deletions

File tree

.github/workflows/ci.yaml

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010
- "release-*"
1111

1212
env:
13-
GO_VERSION: "1.20.x"
13+
GO_VERSION: "1.22.x"
1414
WORKDIR: src/github.com/containers/otelttrpc
1515

1616
permissions:
@@ -27,16 +27,16 @@ jobs:
2727
timeout-minutes: 5
2828

2929
steps:
30-
- uses: actions/setup-go@v3
30+
- uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
3131
with:
3232
go-version: ${{ env.GO_VERSION }}
3333

34-
- uses: actions/checkout@v3
34+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3535
with:
3636
path: ${{ env.WORKDIR }}
3737
fetch-depth: 25
3838

39-
- uses: containerd/[email protected]
39+
- uses: containerd/project-checks@434a07157608eeaa1d5c8d4dd506154204cd9401 # v1.1.0
4040
with:
4141
working-directory: ${{ env.WORKDIR }}
4242

@@ -54,28 +54,23 @@ jobs:
5454

5555
steps:
5656
- name: Checkout code
57-
uses: actions/checkout@v3
57+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5858
with:
5959
path: ${{ env.WORKDIR }}
6060

6161
- name: Setup golang toolchain
62-
uses: actions/setup-go@v3
62+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
6363
with:
6464
go-version: ${{ env.GO_VERSION }}
6565

6666
- name: Run golangci-lint
67-
uses: golangci/golangci-lint-action@v3
67+
uses: golangci/golangci-lint-action@971e284b6050e8a5849b72094c50ab08da042db8 # v6.1.1
6868
with:
69-
version: v1.55
69+
version: v1.60.3
7070
args: --timeout=10m
7171
skip-cache: true
7272
working-directory: ${{ env.WORKDIR }}
7373

74-
- name: Show golangci-lint errors
75-
run: make lint
76-
working-directory: ${{ env.WORKIR }}
77-
if: ${{ failure() }}
78-
7974
#
8075
# Tests and other checks
8176
#
@@ -89,12 +84,12 @@ jobs:
8984
runs-on: ${{ matrix.os }}
9085
steps:
9186
- name: Checkout code
92-
uses: actions/checkout@v3
87+
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9388
with:
9489
path: ${{ env.WORKDIR }}
9590

9691
- name: Setup golang toolchain
97-
uses: actions/setup-go@v3
92+
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
9893
with:
9994
go-version: ${{ env.GO_VERSION }}
10095

example/go.mod

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
module github.com/containerd/otelttrpc/example
22

3-
go 1.18
3+
go 1.21
44

55
require (
6-
github.com/containerd/otelttrpc v0.0.0-00010101000000-000000000000
6+
github.com/containerd/otelttrpc v0.0.0-20240305015340-ea5083fda723
77
github.com/containerd/ttrpc v1.2.7
8-
go.opentelemetry.io/otel v1.19.0
9-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.19.0
10-
go.opentelemetry.io/otel/sdk v1.19.0
11-
go.opentelemetry.io/otel/trace v1.19.0
8+
go.opentelemetry.io/otel v1.29.0
9+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.29.0
10+
go.opentelemetry.io/otel/sdk v1.29.0
11+
go.opentelemetry.io/otel/trace v1.29.0
1212
google.golang.org/protobuf v1.33.0
1313
)
1414

1515
require (
1616
github.com/containerd/log v0.1.0 // indirect
17-
github.com/go-logr/logr v1.3.0 // indirect
17+
github.com/go-logr/logr v1.4.2 // indirect
1818
github.com/go-logr/stdr v1.2.2 // indirect
1919
github.com/golang/protobuf v1.5.3 // indirect
20+
github.com/google/uuid v1.6.0 // indirect
2021
github.com/sirupsen/logrus v1.9.3 // indirect
21-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
22-
golang.org/x/sys v0.18.0 // indirect
22+
go.opentelemetry.io/otel/metric v1.29.0 // indirect
23+
golang.org/x/sys v0.28.0 // indirect
2324
google.golang.org/genproto/googleapis/rpc v0.0.0-20230731190214-cbb8c96f2d6d // indirect
2425
google.golang.org/grpc v1.57.1 // indirect
2526
)

0 commit comments

Comments
 (0)