Skip to content

Commit d7c0966

Browse files
authored
Fix issues with 'make generate' (#819)
This fixes issues in `make generate` that led to some generated code in here being incorrect (generated from incorrect version of protoc-gen-go) yet it was not being caught in CI. The issues was that plugins were not made available in PATH to the steps in a separate generate.sh script. And then that script was failing to return a non-zero exit code when some of the steps therein failed.
1 parent 720d197 commit d7c0966

File tree

7 files changed

+217
-67
lines changed

7 files changed

+217
-67
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ generate: $(BIN)/buf $(BIN)/protoc-gen-go $(BIN)/protoc-gen-connect-go $(BIN)/li
8282
cd internal/conformance && go mod tidy
8383
rm -rf internal/gen
8484
PATH="$(abspath $(BIN))" buf generate
85-
( cd cmd/protoc-gen-connect-go; ./generate.sh )
85+
( cd cmd/protoc-gen-connect-go; PATH="$(abspath $(BIN)):$$PATH" ./generate.sh )
8686
license-header \
8787
--license-type apache \
8888
--copyright-holder "The Connect Authors" \
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash
2-
find testdata -maxdepth 1 -type d \( ! -name testdata \) -exec bash -c "cd '{}' && buf generate" \;
2+
find testdata -maxdepth 1 -type d \( ! -name testdata \) | xargs -n 1 -I % bash -c "cd '%' && buf generate"

cmd/protoc-gen-connect-go/testdata/defaultpackage/defaultpackage.pb.go

Lines changed: 43 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/protoc-gen-connect-go/testdata/diffpackage/diffpackage.pb.go

Lines changed: 43 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

cmd/protoc-gen-connect-go/testdata/noservice/noservice.pb.go

Lines changed: 43 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)