From a1fd9075b664c3ec4e9fba97ccf36580a318828f Mon Sep 17 00:00:00 2001 From: Diptanu Choudhury Date: Fri, 12 Feb 2016 10:36:11 -0800 Subject: [PATCH] Fixed the make dev target --- Makefile | 2 +- scripts/build.sh | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index 5e11ee6c1..ef1a6406a 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -PACKAGES = $(shell go list ./...) +PACKAGES = $(shell go list ./... | grep -v '/vendor/') VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods \ -nilfunc -printf -rangeloops -shift -structtags -unsafeptr EXTERNAL_TOOLS=\ diff --git a/scripts/build.sh b/scripts/build.sh index 332264bb0..c1faef5b6 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -3,6 +3,8 @@ # This script builds the application from source for multiple platforms. set -e +export GO15VENDOREXPERIMENT=1 + # Get the parent directory of where this script is. SOURCE="${BASH_SOURCE[0]}" while [ -h "$SOURCE" ] ; do SOURCE="$(readlink "$SOURCE")"; done @@ -19,10 +21,6 @@ GIT_DIRTY=$(test -n "`git status --porcelain`" && echo "+CHANGES" || true) XC_ARCH=${XC_ARCH:-"386 amd64 arm"} XC_OS=${XC_OS:-linux darwin windows freebsd openbsd} -# Install dependencies -echo "==> Getting dependencies..." -go get ./... - # Delete the old dir echo "==> Removing old directory..." rm -f bin/*