Commit 5837bf24 authored by madengji's avatar madengji

modify protobuf

parent 4772fd58
...@@ -6,7 +6,7 @@ pipeline { ...@@ -6,7 +6,7 @@ pipeline {
environment { environment {
GOPATH = "${WORKSPACE}" GOPATH = "${WORKSPACE}"
PROJ_DIR = "${WORKSPACE}/src/gitlab.33.cn/chain33/chain33" PROJ_DIR = "${WORKSPACE}/src/gitlab.33.cn/chain33/plugin"
} }
options { options {
...@@ -15,7 +15,7 @@ pipeline { ...@@ -15,7 +15,7 @@ pipeline {
timestamps() timestamps()
gitLabConnection('gitlab33') gitLabConnection('gitlab33')
gitlabBuilds(builds: ['check', 'build', 'test', 'deploy']) gitlabBuilds(builds: ['check', 'build', 'test', 'deploy'])
checkoutToSubdirectory "src/gitlab.33.cn/chain33/chain33" checkoutToSubdirectory "src/gitlab.33.cn/chain33/plugin"
} }
stages { stages {
...@@ -49,7 +49,7 @@ pipeline { ...@@ -49,7 +49,7 @@ pipeline {
environment { environment {
GOPATH = "${WORKSPACE}" GOPATH = "${WORKSPACE}"
PROJ_DIR = "${WORKSPACE}/src/gitlab.33.cn/chain33/chain33" PROJ_DIR = "${WORKSPACE}/src/gitlab.33.cn/chain33/plugin"
} }
steps { steps {
......
...@@ -189,7 +189,7 @@ mock: ...@@ -189,7 +189,7 @@ mock:
.PHONY: auto_ci_before auto_ci_after auto_ci .PHONY: auto_ci_before auto_ci_after auto_ci
auto_ci_before: clean fmt protobuf mock auto_ci_before: clean fmt protobuf
@echo "auto_ci" @echo "auto_ci"
@go version @go version
@protoc --version @protoc --version
...@@ -200,7 +200,7 @@ auto_ci_before: clean fmt protobuf mock ...@@ -200,7 +200,7 @@ auto_ci_before: clean fmt protobuf mock
@git status @git status
.PHONY: auto_ci_after .PHONY: auto_ci_after
auto_ci_after: clean fmt protobuf mock auto_ci_after: clean fmt protobuf
@git add *.go *.sh *.proto @git add *.go *.sh *.proto
@git status @git status
@files=$$(git status -suno);if [ -n "$$files" ]; then \ @files=$$(git status -suno);if [ -n "$$files" ]; then \
...@@ -212,7 +212,7 @@ auto_ci_after: clean fmt protobuf mock ...@@ -212,7 +212,7 @@ auto_ci_after: clean fmt protobuf mock
.PHONY: auto_ci .PHONY: auto_ci
auto_fmt := find . -name '*.go' -not -path './vendor/*' | xargs goimports -l -w auto_fmt := find . -name '*.go' -not -path './vendor/*' | xargs goimports -l -w
auto_ci: clean fmt_proto fmt_shell protobuf mock auto_ci: clean fmt_proto fmt_shell protobuf
@-find . -name '*.go' -not -path './vendor/*' | xargs gofmt -l -w -s @-find . -name '*.go' -not -path './vendor/*' | xargs gofmt -l -w -s
@-${auto_fmt} @-${auto_fmt}
@-find . -name '*.go' -not -path './vendor/*' | xargs gofmt -l -w -s @-find . -name '*.go' -not -path './vendor/*' | xargs gofmt -l -w -s
......
#!/bin/sh #!/bin/sh
protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="../../../../types/proto/" protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="$GOPATH/src/gitlab.33.cn/chain33/chain33/types/proto/"
#!/bin/sh #!/bin/sh
protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="../../../../types/proto/" protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="$GOPATH/src/gitlab.33.cn/chain33/chain33/types/proto/"
#!/bin/sh #!/bin/sh
protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="../../../../types/proto/" protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="$GOPATH/src/gitlab.33.cn/chain33/chain33/types/proto/"
#!/bin/sh #!/bin/sh
protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="../../../../types/proto/" protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="$GOPATH/src/gitlab.33.cn/chain33/chain33/types/proto/"
#!/bin/sh #!/bin/sh
protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="../../../../types/proto/" protoc --go_out=plugins=grpc:../types ./*.proto --proto_path=. --proto_path="$GOPATH/src/gitlab.33.cn/chain33/chain33/types/proto/"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment