Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitaly.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Okstad <pokstad@gitlab.com>2019-02-26 01:10:30 +0300
committerPaul Okstad <pokstad@gitlab.com>2019-02-27 02:07:36 +0300
commit648a599fa74a394ff46501ba2500edce46040b76 (patch)
tree2c375e418c0957db44482adde21cb3b63ede3779
parentc38f4a97d24a5c6b7e28f5f2890a14b8ea13ad4f (diff)
ensure generated code is formatted properly
-rw-r--r--changelogs/unreleased/po_protoc_gen_gitaly.yml5
-rw-r--r--internal/praefect/Makefile1
-rw-r--r--internal/praefect/pb/optype.pb.go3
3 files changed, 8 insertions, 1 deletions
diff --git a/changelogs/unreleased/po_protoc_gen_gitaly.yml b/changelogs/unreleased/po_protoc_gen_gitaly.yml
new file mode 100644
index 000000000..f7578f236
--- /dev/null
+++ b/changelogs/unreleased/po_protoc_gen_gitaly.yml
@@ -0,0 +1,5 @@
+---
+title: Protobuf file linter for Gitaly processes
+merge_request: 1095
+author:
+type: added
diff --git a/internal/praefect/Makefile b/internal/praefect/Makefile
index d1ba0a324..c3fea5694 100644
--- a/internal/praefect/Makefile
+++ b/internal/praefect/Makefile
@@ -7,6 +7,7 @@ PWD := $(shell pwd)
pb/optype.pb.go: pb/optype.proto
protoc --go_out=$(GOPATH)/src pb/optype.proto
+ goimports -w pb/optype.pb.go
pb/linter/testdata/%.pb.go: pb/linter/testdata/%.proto pb/optype.pb.go
protoc --go_out=./pb -I${PWD}/pb -I${PWD}/pb/linter/testdata ${PWD}/pb/linter/testdata/*.proto
diff --git a/internal/praefect/pb/optype.pb.go b/internal/praefect/pb/optype.pb.go
index ee1b8085e..ac3bc3cf6 100644
--- a/internal/praefect/pb/optype.pb.go
+++ b/internal/praefect/pb/optype.pb.go
@@ -5,9 +5,10 @@ package pb
import (
fmt "fmt"
+ math "math"
+
proto "github.com/golang/protobuf/proto"
descriptor "github.com/golang/protobuf/protoc-gen-go/descriptor"
- math "math"
)
// Reference imports to suppress errors if they are not otherwise used.