diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-17 13:15:53 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2020-11-17 13:15:53 +0300 |
| commit | 4f8473f034767f090b84d65e55a1ae0fb3facc23 (patch) | |
| tree | 21895bb7590224d4e7b99969cfef1617bcb885d4 | |
| parent | dbcb82abebc93924820ad2b4f29fd42040267e3b (diff) | |
Makefile: Move dependency on proto-lint to protoc-gen-gitaly target
The "proto" target currently depends on the proto-lint target, whose
purpose it is to generate code for "lint.proto".
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -312,7 +312,7 @@ docker: docker build -t gitlab/gitaly:v${GITALY_VERSION} -t gitlab/gitaly:latest ${BUILD_DIR}/docker/ .PHONY: proto -proto: ${PROTOC_GEN_GITALY} ${SOURCE_DIR}/.ruby-bundle proto-lint +proto: ${PROTOC_GEN_GITALY} ${SOURCE_DIR}/.ruby-bundle ${PROTOC} --gitaly_out=proto_dir=./proto,gitalypb_dir=./proto/go/gitalypb:. --go_out=paths=source_relative,plugins=grpc:./proto/go/gitalypb -I./proto ./proto/*.proto ${SOURCE_DIR}/_support/generate-proto-ruby ${Q}# this part is related to the generation of sources from testing proto files @@ -426,7 +426,7 @@ ${PROTOC}: ${BUILD_DIR}/protoc.zip | ${BUILD_DIR} ${GITALYFMT}: | ${BUILD_DIR}/bin ${Q}go build -o $@ ${SOURCE_DIR}/internal/cmd/gitalyfmt -${PROTOC_GEN_GITALY}: | ${BUILD_DIR}/bin +${PROTOC_GEN_GITALY}: proto-lint | ${BUILD_DIR}/bin ${Q}go build -o $@ ${SOURCE_DIR}/proto/go/internal/cmd/protoc-gen-gitaly ${GOCOVER_COBERTURA}: ${BUILD_DIR}/Makefile.sha256 |