From 45dfa5ef57663e115682e1992a93745b80f61e69 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 d74eda780..6ce34f5b5 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 e0da9c2c7807b6e3c43d1b62d1377d777500b00c 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 0a71c5238..8d612b3a1 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 \