diff options
| author | Jacob Vosmaer <jacob@gitlab.com> | 2019-10-23 19:31:11 +0300 |
|---|---|---|
| committer | Jacob Vosmaer <jacob@gitlab.com> | 2019-10-23 19:31:11 +0300 |
| commit | 62019f974334333572eb0238c93859e5e729b06c (patch) | |
| tree | 5bf570d969506fcf6053572b4ce0b18599088327 | |
| parent | 11980609ad78842b5cf83899d1bb002bbbe9ba2d (diff) | |
Fix protoc-gen-gitaly in 1-65-stablefix-protoc-gen-gitaly-1-65-stable
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | _support/Makefile.template | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -124,4 +124,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/Makefile.template b/_support/Makefile.template index 986d8338f..45f6b640f 100644 --- a/_support/Makefile.template +++ b/_support/Makefile.template @@ -271,8 +271,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 |