From b5c4335827eade52ab960f037a38085bdb3fcd00 Mon Sep 17 00:00:00 2001 From: Ying Li Date: Wed, 7 Jun 2017 19:04:58 -0700 Subject: [PATCH] Bump go verison up to 1.8.3 for security updates, etc., and remove installing the extra mockgen package when installing dependencies. Signed-off-by: Ying Li --- Makefile | 7 +++---- circle.yml | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 72509345e6..112cd3fd4e 100644 --- a/Makefile +++ b/Makefile @@ -45,7 +45,6 @@ setup: ## install dependencies # TODO(stevvooe): Install these from the vendor directory @go get -u github.com/golang/lint/golint #@go get -u github.com/kisielk/errcheck - @go get -u github.com/golang/mock/mockgen @go get -u github.com/gordonklaus/ineffassign @go get -u github.com/client9/misspell/cmd/misspell @go get -u github.com/lk4d4/vndr @@ -81,15 +80,15 @@ fmt: ## run go fmt lint: ## run go lint @echo "🐳 $@" - @test -z "$$(golint ./... | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)" + @test -z "$$(golint ./... | grep -v vendor/ | grep -v ".pb.go:" | tee /dev/stderr)" ineffassign: ## run ineffassign @echo "🐳 $@" - @test -z "$$(ineffassign . | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)" + @test -z "$$(ineffassign . | grep -v vendor/ | grep -v ".pb.go:" | tee /dev/stderr)" #errcheck: ## run go errcheck # @echo "🐳 $@" -# @test -z "$$(errcheck ./... | grep -v vendor/ | grep -v ".pb.go:" | grep -v ".mock.go" | tee /dev/stderr)" +# @test -z "$$(errcheck ./... | grep -v vendor/ | grep -v ".pb.go:" | tee /dev/stderr)" build: ## build the go packages @echo "🐳 $@" diff --git a/circle.yml b/circle.yml index 0298bf0369..556d2b4aac 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: PROTOC: "https://github.com/google/protobuf/releases/download/v3.2.0/protoc-3.2.0-linux-x86_64.zip" - GOVERSION: "1.8.1" + GOVERSION: "1.8.3" GOPATH: "$HOME/.go_workspace" WORKDIR: "$GOPATH/src/github.com/$CIRCLE_PROJECT_USERNAME/$CIRCLE_PROJECT_REPONAME"