diff options
| author | John Cai <jcai@gitlab.com> | 2019-10-24 00:41:17 +0300 |
|---|---|---|
| committer | John Cai <jcai@gitlab.com> | 2019-10-24 00:41:17 +0300 |
| commit | c90f9e3f04d4912cbca9ed9fad9a328e2c28cb78 (patch) | |
| tree | 6333fa1587d30a0e4818341c38bc926255173dd1 | |
| parent | 40bf0a23b6a39903593d5a6dc7c93256d98bc7a9 (diff) | |
| parent | df31121816ef80dd25f822c37ab6f16ebaa130f5 (diff) | |
Merge branch 'fix-protoc-gen-gitaly-1-59' into '1-59-stable'1-59-stable
Fix protoc-gen-gitaly in 1-59-stable
See merge request gitlab-org/gitaly!1580
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | _support/makegen.go | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -120,4 +120,5 @@ _build/makegen: _support/makegen.go $(BUILD_DIR)/go.mod cd $(BUILD_DIR) && go build -o $(CURDIR)/$@ $(SOURCE_DIR)/_support/makegen.go clean: + rm -rf $(BUILD_DIR) git clean -fdX diff --git a/_support/makegen.go b/_support/makegen.go index 91f1814ff..1a436cfe7 100644 --- a/_support/makegen.go +++ b/_support/makegen.go @@ -577,8 +577,8 @@ proto: {{ .ProtoC }} {{ .ProtoCGenGo }} {{ .ProtoCGenGitaly }} {{ .GrpcToolsRuby go get github.com/golang/protobuf/protoc-gen-go@v1.3.2 {{ .ProtoCGenGitaly }}: - # Todo fix protoc-gen-gitaly versioning - go install gitlab.com/gitlab-org/gitaly-proto/go/internal/cmd/protoc-gen-gitaly + git clone --quiet -b v1.39.0 https://gitlab.com/gitlab-org/gitaly-proto.git {{ .BuildDir }}/gitaly-proto + cd {{ .BuildDir }}/gitaly-proto/go/internal/cmd/protoc-gen-gitaly && go build -o $@ {{ .GrpcToolsRuby }}: gem install --bindir {{ .BuildDir }}/bin -v 1.0.1 grpc-tools |