mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: install github.com/myitcv/gobin while gobin doesn't exist.

Browse Source
This commit is contained in:
CFC4N 2020-10-30 20:58:00 +08:00
parent 7da5182f1d
commit 2e55875cc7
No known key found for this signature in database
GPG Key ID: 93674013BC5F0FBD
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/genproto.sh
View File

@ -17,8 +17,6 @@ if [[ $(protoc --version | cut -f2 -d' ') != "3.12.3" ]]; then
exit 255 exit 255
fi fi
run env GO111MODULE=off go get -u github.com/myitcv/gobin
GOFAST_BIN=$(tool_get_bin github.com/gogo/protobuf/protoc-gen-gofast) GOFAST_BIN=$(tool_get_bin github.com/gogo/protobuf/protoc-gen-gofast)
GRPC_GATEWAY_BIN=$(tool_get_bin github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway) GRPC_GATEWAY_BIN=$(tool_get_bin github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway)
SWAGGER_BIN=$(tool_get_bin github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger) SWAGGER_BIN=$(tool_get_bin github.com/grpc-ecosystem/grpc-gateway/protoc-gen-swagger)

7
scripts/test_lib.sh
View File

@ -278,6 +278,11 @@ function tool_exists {
fi fi
} }
# Ensure gobin is available, as it runs majority of the tools
if ! command -v "gobin" >/dev/null; then
run env GO111MODULE=off go get github.com/myitcv/gobin || exit 1
fi
# tool_get_bin [tool] - returns absolute path to a tool binary (or returns error) # tool_get_bin [tool] - returns absolute path to a tool binary (or returns error)
function tool_get_bin { function tool_get_bin {
tool_exists "gobin" "GO111MODULE=off go get github.com/myitcv/gobin" || return 2 tool_exists "gobin" "GO111MODULE=off go get github.com/myitcv/gobin" || return 2
@ -308,5 +313,3 @@ function run_go_tool {
run "${cmdbin}" "$@" || return 2 run "${cmdbin}" "$@" || return 2
} }
# Ensure gobin is available, as it runs majority of the tools
run env GO111MODULE=off go get github.com/myitcv/gobin