corrections

Signed-off-by: Yuri Shkuro <[email protected]>

Author: yurishkuro

.github/workflows/ci-lint-test.yml

@@ -34,4 +34,4 @@ jobs:
         run: make proto && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }
 
       - name: Verify Thrift types are up to date  
-        run: make thrift && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }  
+        run: make thrift && { if git status --porcelain | grep '??'; then exit 1; else git diff --name-status --exit-code; fi }

Makefile

@@ -30,7 +30,7 @@ THRIFT_FILES=agent.thrift jaeger.thrift sampling.thrift zipkincore.thrift crossd
 THRIFT_GEN_DIR=thrift-gen
 
 .PHONY: test-code-gen
-test-code-gen: thrift swagger-validate protocompile proto proto-zipkin
+test-code-gen: thrift-all swagger-validate protocompile proto-all proto-zipkin
 	git diff --exit-code ./swagger/api_v3/query_service.swagger.json
 
 .PHONY: swagger-validate
@@ -44,11 +44,14 @@ clean:
 	rm -rf coverage.txt
 
 .PHONY: thrift
-thrift: thrift-image clean $(THRIFT_FILES)
+thrift:
 	[ -d $(THRIFT_GEN_DIR) ] || mkdir $(THRIFT_GEN_DIR)
 	$(THRIFT) -o /data --gen go:$(THRIFT_GO_ARGS) -out /data/$(THRIFT_GEN_DIR) /data/thrift/zipkincore.thrift
 	rm -rf thrift-gen/*/*-remote thrift-gen/*/*.bak
 
+.PHONY: thrift-all
+thrift-all: thrift-image clean $(THRIFT_FILES)
+
 $(THRIFT_FILES):
 	@echo Compiling $@
 	$(THRIFT_CMD) /data/thrift/$@

README.md

@@ -16,7 +16,7 @@ This repository does not publish the generated code, but it does run Thrift and
 
 To generate the stubs for your own purposes:
   * clone the repository
-  * run `make proto` or `make thrift`
+  * run `make proto-all` or `make thrift-all`
   * the stubs will be generated under `gen-{lang}` for Thrift and `proto-gen-{lang}` for Protobuf