Skip to content

Commit 0ecfaab

Browse files
committed
fix(protos): ensure protobuild sees repo root and use repo bin for plugins
1 parent c4c32e6 commit 0ecfaab

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,9 +192,9 @@ protos: bin/protoc-gen-go-fieldpath
192192
@echo "$(WHALE) $@"
193193
@find . -path ./vendor -prune -false -o -name '*.pb.go' -exec rm -f {} +
194194
$(eval TMPDIR := $(shell mktemp -d))
195-
@sed "s|before = \[\"\./\",|before = [\"$(ROOTDIR)\",|" Protobuild.toml > $(TMPDIR)/Protobuild.toml
195+
@sed "s|before = \[\"\./protobuf\", \"\./vendor\"\]|before = [\"$(ROOTDIR)\", \"./protobuf\", \"./vendor\"]|" Protobuild.toml > $(TMPDIR)/Protobuild.toml
196196
@(PATH="${ROOTDIR}/bin:${PATH}" protobuild -f $(TMPDIR)/Protobuild.toml --quiet ${NON_API_PACKAGES})
197-
PATH="${ROOTDIR}/bin:${PATH}" go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find runtime/ -name '*.pb.go')
197+
@(PATH="${ROOTDIR}/bin:${PATH}" go-fix-acronym -w -a '(Id|Io|Uuid|Os)$$' $(shell find runtime/ -name '*.pb.go'))
198198

199199
check-protos: protos ## check if protobufs needs to be generated again
200200
@echo "$(WHALE) $@"

0 commit comments

Comments
 (0)