diff --git a/.travis.yml b/.travis.yml index 07c31a05..c4dd5d31 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,7 @@ language: go dist: xenial go: - - 1.11.x + - 1.12.x env: global: @@ -17,6 +17,7 @@ before_install: ## checkers - go get -v golang.org/x/lint/golint - go get -v github.com/fzipp/gocyclo + - go get -v golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow ## hack for building on forks - repo=`basename $PWD`; src=`dirname $PWD`; dest="`dirname $src`/intel" - if [[ "$src" != "$dest" ]]; then mv "$src" "$dest"; cd ../../intel/$repo; export TRAVIS_BUILD_DIR=`dirname $TRAVIS_BUILD_DIR`/$repo; fi diff --git a/Jenkinsfile b/Jenkinsfile index 63d9a928..8ebbd1fb 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ pipeline { RUNC_VERSION="v1.0.0-rc8" CRIO_VERSION="v1.14.6" BUILDAH_VERSION="v1.10.0" - GO_VERSION="1.11.11" + GO_VERSION="1.12.8" GO_TAR="go${GO_VERSION}.linux-amd64.tar.gz" GOROOT="/usr/local/go" GOPATH="/tmp/go" @@ -29,6 +29,7 @@ pipeline { sh "cp -rf ${env.WORKSPACE} $REPO_DIR" dir(path: "$REPO_DIR") { sh "go get -v golang.org/x/lint/golint" + sh "go get -v golang.org/x/tools/go/analysis/passes/shadow/cmd/shadow" sh "go get -v github.com/fzipp/gocyclo" } } diff --git a/Makefile b/Makefile index c5c83cea..bb159fc2 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ format: @report=`$(GOFMT) -s -d -w $$(find cmd pkg -name \*.go)` ; if [ -n "$$report" ]; then echo "$$report"; exit 1; fi vet: - @$(GO) vet -v -shadow $(pkgs) + @$(GO) vet -v -vettool=$$(which shadow) $(pkgs) cyclomatic-check: @report=`$(GOCYCLO) -over 15 cmd pkg`; if [ -n "$$report" ]; then echo "Complexity is over 15 in"; echo $$report; exit 1; fi