From e685c8546fdc18204c873b1af44c63a82663d8dc Mon Sep 17 00:00:00 2001 From: Felix Lange Date: Thu, 3 Nov 2016 11:18:44 +0100 Subject: [PATCH] build: remove godep remains --- Makefile | 2 +- build/env.sh | 1 - build/update-license.go | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f23b32f42c..d3d67950e9 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,7 @@ test: all build/env.sh go run build/ci.go test clean: - rm -fr build/_workspace/pkg/ Godeps/_workspace/pkg $(GOBIN)/* + rm -fr build/_workspace/pkg/ $(GOBIN)/* # Cross Compilation Targets (xgo) diff --git a/build/env.sh b/build/env.sh index c418dae441..3914555d1b 100755 --- a/build/env.sh +++ b/build/env.sh @@ -19,7 +19,6 @@ if [ ! -L "$ethdir/go-ethereum" ]; then fi # Set up the environment to use the workspace. -# Also add Godeps workspace so we build using canned dependencies. GOPATH="$workspace" export GOPATH diff --git a/build/update-license.go b/build/update-license.go index 96667be15a..94b3195506 100644 --- a/build/update-license.go +++ b/build/update-license.go @@ -45,7 +45,7 @@ var ( // paths with any of these prefixes will be skipped skipPrefixes = []string{ // boring stuff - "Godeps/", "tests/files/", "build/", + "vendor/", "tests/files/", "build/", // don't relicense vendored sources "crypto/sha3/", "crypto/ecies/", "logger/glog/", "crypto/secp256k1/curve.go",