From f87550d0686a0db65ff40b2e527da2caf7385331 Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Thu, 8 Jan 2026 17:03:28 -0800 Subject: [PATCH] Install buf from install-dev-tools Signed-off-by: Maksym Pavlenko --- Makefile | 8 ++------ script/setup/install-dev-tools | 1 + 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 1445581bdd..b1941bada5 100644 --- a/Makefile +++ b/Makefile @@ -176,9 +176,9 @@ generate: protos @echo "$(WHALE) $@" @PATH="${ROOTDIR}/bin:${PATH}" $(GO) generate -x ${PACKAGES} -protos: bin/protoc-gen-go-fieldpath bin/go-buildtag bin/buf +protos: bin/protoc-gen-go-fieldpath bin/go-buildtag @echo "$(WHALE) $@" - (cd api && PATH="$(ROOTDIR)/bin:$$PATH" buf dep update) + (cd api && buf dep update) (cd api && PATH="$(ROOTDIR)/bin:$$PATH" buf generate) @rm -f api/runtime/task/v2/shim_grpc.pb.go api/services/ttrpc/events/v1/events_grpc.pb.go @find api/ -name '*_fieldpath.pb.go' ! -path 'api/events/*' -delete @@ -274,10 +274,6 @@ bin/containerd-shim-runc-v2: cmd/containerd-shim-runc-v2 FORCE # set !cgo and om @echo "$(WHALE) $@" CGO_ENABLED=${SHIM_CGO_ENABLED} $(GO) build ${GO_BUILD_FLAGS} -o $@ ${SHIM_GO_LDFLAGS} ${SHIM_GO_TAGS} ./cmd/containerd-shim-runc-v2 -bin/buf: - @echo "$(WHALE) $@" - GOBIN=$(CURDIR)/bin $(GO) install github.com/bufbuild/buf/cmd/buf@v1.63.0 - binaries: $(BINARIES) ## build binaries @echo "$(WHALE) $@" diff --git a/script/setup/install-dev-tools b/script/setup/install-dev-tools index 96c77e3395..be34e26579 100755 --- a/script/setup/install-dev-tools +++ b/script/setup/install-dev-tools @@ -23,3 +23,4 @@ go install github.com/containerd/protobuild/cmd/go-fix-acronym@v0.3.0 go install github.com/cpuguy83/go-md2man/v2@v2.0.7 go install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.1.5 go install github.com/containerd/ttrpc/cmd/protoc-gen-go-ttrpc@v1.2.5 +go install github.com/bufbuild/buf/cmd/buf@v1.63.0