From ed6fd1ec4143ac2fa22a5fbcc04d366ce0b96d0b Mon Sep 17 00:00:00 2001 From: Alvin Huang Date: Wed, 10 Apr 2019 12:56:55 -0400 Subject: [PATCH 1/2] checkout code outside GOPATH --- .circleci/config.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d74eda7806..6ce34f5b5b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -29,7 +29,6 @@ jobs: - image: *GOLANG_IMAGE environment: &build-env GOXPARALLEL: 2 # CircleCI containers are 2 CPU x 4GB RAM - working_directory: /go/src/github.com/hashicorp/consul steps: - checkout - run: make tools @@ -67,7 +66,6 @@ jobs: dev-build: docker: - image: *GOLANG_IMAGE - working_directory: /go/src/github.com/hashicorp/consul steps: - checkout - run: make dev From ffa123b73e4c0262e0a8a15d1f62c4ed7d9a88de Mon Sep 17 00:00:00 2001 From: Alvin Huang Date: Wed, 10 Apr 2019 13:09:02 -0400 Subject: [PATCH 2/2] download tools without library --- GNUmakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GNUmakefile b/GNUmakefile index 0a71c52387..8d612b3a11 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -1,7 +1,7 @@ SHELL = bash GOTOOLS = \ - github.com/elazarl/go-bindata-assetfs/... \ - github.com/hashicorp/go-bindata/... \ + github.com/elazarl/go-bindata-assetfs/go-bindata-assetfs \ + github.com/hashicorp/go-bindata/go-bindata \ github.com/mitchellh/gox \ golang.org/x/tools/cmd/cover \ golang.org/x/tools/cmd/stringer \