From 2ae87eee4eb9fed545df6418d70b2327d61dfe20 Mon Sep 17 00:00:00 2001 From: Anton Kaliaev Date: Wed, 28 Feb 2018 12:24:26 +0400 Subject: [PATCH] style fixes from @xla --- CONTRIBUTING.md | 8 ++++---- scripts/dep_utils/checkout.sh | 3 ++- scripts/dep_utils/parse.sh | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c725e9f60..5fd2d982f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -43,9 +43,9 @@ software. Since some dependencies are not under our control, a third party may break our build, in which case we can fall back on `dep ensure` (or `make -get_vendor_deps`). Even for dependencies under our control, dep helps us keeps -multiple repos in sync as they evolve. Anything with an executable, such as -apps, tools, and the core, should use dep. +get_vendor_deps`). Even for dependencies under our control, dep helps us to +keep multiple repos in sync as they evolve. Anything with an executable, such +as apps, tools, and the core, should use dep. Run `dep status` to get a list of vendored dependencies that may not be up-to-date. @@ -66,7 +66,7 @@ make test ## Testing -All repos should be hooked up to circle. +All repos should be hooked up to [CircleCI](https://circleci.com/). If they have `.go` files in the root directory, they will be automatically tested by circle using `go test -v -race ./...`. If not, they will need a diff --git a/scripts/dep_utils/checkout.sh b/scripts/dep_utils/checkout.sh index 02b23d048..c88c3e807 100644 --- a/scripts/dep_utils/checkout.sh +++ b/scripts/dep_utils/checkout.sh @@ -2,10 +2,11 @@ set +u if [[ "$DEP" == "" ]]; then - DEP=$GOPATH/src/github.com/tendermint/tendermint/Gopkg.lock + DEP=$GOPATH/src/github.com/tendermint/tendermint/Gopkg.lock fi set -u + set -u function getVendoredVersion() { diff --git a/scripts/dep_utils/parse.sh b/scripts/dep_utils/parse.sh index 290cab559..e6519efa0 100644 --- a/scripts/dep_utils/parse.sh +++ b/scripts/dep_utils/parse.sh @@ -2,10 +2,11 @@ set +u if [[ "$DEP" == "" ]]; then - DEP=$GOPATH/src/github.com/tendermint/tendermint/Gopkg.lock + DEP=$GOPATH/src/github.com/tendermint/tendermint/Gopkg.lock fi set -u + set -euo pipefail LIB=$1