Skip to content

Commit 65031ea

Browse files
committed
Update protobuild to build ttrpc services
Signed-off-by: Derek McGowan <[email protected]>
1 parent 4510ca3 commit 65031ea

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

api/Protobuild.toml

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
version = "2"
2-
generators = ["go", "go-grpc"]
2+
generators = ["go", "go-grpc", "go-ttrpc"]
33

44
# Control protoc include paths. Below are usually some good defaults, but feel
55
# free to try it without them if it works for your project.
@@ -18,39 +18,45 @@ generators = ["go", "go-grpc"]
1818
[packages]
1919
"google/rpc/status.proto" = "google.golang.org/genproto/googleapis/rpc/status"
2020

21+
[parameters.go-ttrpc]
22+
prefix = "TTRPC"
23+
2124
[[overrides]]
2225
prefixes = ["github.com/containerd/containerd/api/events"]
2326
generators = ["go", "go-ttrpc", "go-fieldpath"]
2427

28+
[overrides.parameters.go-ttrpc]
29+
prefix = ""
30+
2531
[[overrides]]
2632
prefixes = ["github.com/containerd/containerd/api/services/ttrpc/events/v1"]
2733
generators = ["go", "go-ttrpc"]
2834

35+
[overrides.parameters.go-ttrpc]
36+
prefix = ""
37+
2938
[[overrides]]
3039
# enable ttrpc and disable fieldpath and grpc for the shim
3140
prefixes = [
3241
"github.com/containerd/containerd/api/runtime/task/v2",
3342
]
3443
generators = ["go", "go-ttrpc"]
3544

45+
[overrides.parameters.go-ttrpc]
46+
prefix = ""
47+
3648
[[overrides]]
3749
prefixes = [
3850
"github.com/containerd/containerd/api/runtime/sandbox/v1",
3951
]
4052
generators = ["go", "go-ttrpc", "go-grpc"]
4153

42-
[overrides.parameters.go-ttrpc]
43-
prefix = "TTRPC"
44-
4554
[[overrides]]
4655
prefixes = [
4756
"github.com/containerd/containerd/api/runtime/task/v3",
4857
]
4958
generators = ["go", "go-ttrpc", "go-grpc"]
5059

51-
[overrides.parameters.go-ttrpc]
52-
prefix = "TTRPC"
53-
5460
# Aggregrate the API descriptors to lock down API changes.
5561
[[descriptors]]
5662
prefix = "github.com/containerd/containerd/api"

script/setup/install-dev-tools

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ go install github.com/cpuguy83/go-md2man/[email protected]
2626
go install github.com/golangci/golangci-lint/cmd/[email protected]
2727
go install google.golang.org/protobuf/cmd/[email protected]
2828
go install google.golang.org/grpc/cmd/[email protected]
29-
go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@5cc9169d1fc1a8292866224ae09dc47827801874
29+
go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@faba5896a9c4d7b65495cb9b2c02531feb1434d6

0 commit comments

Comments
 (0)