From f15b27776eb1a6a05f34b782e0181e5c9a33ebc1 Mon Sep 17 00:00:00 2001 From: Jacob Vosmaer Date: Wed, 23 Oct 2019 18:26:04 +0200 Subject: Fix protoc-gen-gitaly in 1-59-stable --- _support/makegen.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 -- cgit v1.2.3