From ff8b229192cb52d7d84b37a375b470d6ddc3d3f0 Mon Sep 17 00:00:00 2001 From: Erik Johnston Date: Wed, 15 Nov 2017 11:12:21 +0000 Subject: [PATCH] Remove vendor/bin from PATH in script (#335) We should no longer be building anything into vendor/bin in the scripts, so adding it to the path can lead to all sorts of confusion if old binaries are there. --- scripts/build-test-lint.sh | 2 +- scripts/find-lint.sh | 2 +- scripts/travis-test.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/build-test-lint.sh b/scripts/build-test-lint.sh index 16078173..f283017f 100755 --- a/scripts/build-test-lint.sh +++ b/scripts/build-test-lint.sh @@ -5,7 +5,7 @@ set -eu export GOPATH="$(pwd):$(pwd)/vendor" -export PATH="$PATH:$(pwd)/vendor/bin:$(pwd)/bin" +export PATH="$PATH:$(pwd)/bin" echo "Checking that it builds" gb build diff --git a/scripts/find-lint.sh b/scripts/find-lint.sh index e2df519c..c7b66b28 100755 --- a/scripts/find-lint.sh +++ b/scripts/find-lint.sh @@ -14,7 +14,7 @@ set -eu export GOPATH="$(pwd):$(pwd)/vendor" -export PATH="$PATH:$(pwd)/vendor/bin:$(pwd)/bin" +export PATH="$PATH:$(pwd)/bin" args="" if [ ${1:-""} = "fast" ] diff --git a/scripts/travis-test.sh b/scripts/travis-test.sh index e472760a..ace9a6c0 100755 --- a/scripts/travis-test.sh +++ b/scripts/travis-test.sh @@ -13,7 +13,7 @@ export GOGC=400 export DENDRITE_LINT_DISABLE_GC=1 export GOPATH="$(pwd):$(pwd)/vendor" -export PATH="$PATH:$(pwd)/vendor/bin:$(pwd)/bin" +export PATH="$PATH:$(pwd)/bin" if [ "${TEST_SUITE:-lint}" == "lint" ]; then ./scripts/find-lint.sh