diff --git a/test b/test index 45eb276f..4b0f6b7f 100755 --- a/test +++ b/test @@ -12,9 +12,8 @@ function help { echo "" echo "commands:" echo " run baseline tests" - echo " all run all tests" - echo " install install deps for running baseline tests" - echo " install all install deps for running all tests" + echo " full run full tests (ie. not short)" + echo " install install deps for running tests" echo "" echo "options:" echo " --scripted dont jump console lines (still use colors)" @@ -97,7 +96,7 @@ while true; do install=1 shift 1 ;; - "all") + "full") fullTestFlags="" shift 1 ;; @@ -117,8 +116,9 @@ if [[ $install -eq 1 ]]; then echo "installing dependencies..." echo "$ go get -u golang.org/x/lint/golint" go get -u golang.org/x/lint/golint - echo "$ go get -u github.com/golangci/golangci-lint/cmd/golangci-lint" - go get -u github.com/golangci/golangci-lint/cmd/golangci-lint + # TODO: update golangci-lint version regularly + echo "$ curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0" + curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.24.0 exit 0 fi @@ -139,11 +139,11 @@ if [[ $(which golint) == "" ]]; then fi if [[ $(which golangci-lint) == "" ]]; then echo "golangci-lint command not found" - echo "install locally with: go get -u github.com/golangci/golangci-lint/cmd/golangci-lint" - echo "or run: ./test install all" - echo "" - echo "hint: install for CI with: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin vX.Y.Z" + echo "install with: curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin vX.Y.Z" echo "don't forget to specify the version you want" + echo "or run: ./test install" + echo "" + echo "alternatively, install the current dev version with: go get -u github.com/golangci/golangci-lint/cmd/golangci-lint" exit 1 fi