From 9c4811b9f554edb0f2cbf97fca3e2f5166156143 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Tue, 11 Aug 2015 20:24:47 -0700 Subject: [PATCH] export path in shippable and travis --- .travis.yml | 3 ++- shippable.yml | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7351bf24f9d..9f2128bd62d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,6 +11,7 @@ install: - go get golang.org/x/tools/cmd/goimports - ./hack/travis/install-etcd.sh - ./hack/build-go.sh + - export PATH=$GOPATH/bin:./third_party/etcd:$PATH script: - ./hack/verify-gofmt.sh @@ -19,7 +20,7 @@ script: - ./hack/verify-generated-conversions.sh - ./hack/verify-generated-deep-copies.sh - ./hack/verify-generated-docs.sh - - PATH=./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh + - ./hack/verify-swagger-spec.sh - ./hack/verify-linkcheck.sh notifications: diff --git a/shippable.yml b/shippable.yml index f880798fb08..a3277f47871 100644 --- a/shippable.yml +++ b/shippable.yml @@ -16,8 +16,10 @@ before_install: - if [[ $SHIPPABLE_GO_VERSION == "tip" ]]; then gvm install tip; gvm use tip; fi - if [[ $SHIPPABLE_GO_VERSION == *release* ]]; then gvm install release; gvm use release; fi - if [[ $SHIPPABLE_GO_VERSION =~ [0-9].[0-9] ]]; then gvm install go$SHIPPABLE_GO_VERSION; gvm use go$SHIPPABLE_GO_VERSION; fi + - ./hack/travis/install-etcd.sh - export GOPATH=$SHIPPABLE_GOPATH - mkdir -p /root/workspace/src/k8s.io; mv /root/workspace/src/github.com/GoogleCloudPlatform/kubernetes /root/workspace/src/k8s.io/kubernetes + - export PATH=$GOPATH/bin:./third_party/etcd:$PATH install: - go get golang.org/x/tools/cmd/cover @@ -25,7 +27,7 @@ install: - go get github.com/mattn/goveralls - go get github.com/tools/godep - ./hack/build-go.sh - - PATH=$GOPATH/bin:$PATH godep go install ./... + - godep go install ./... - ./hack/travis/install-etcd.sh - ./hack/verify-gofmt.sh - ./hack/verify-boilerplate.sh @@ -34,7 +36,7 @@ install: - ./hack/verify-generated-conversions.sh - ./hack/verify-generated-deep-copies.sh - ./hack/verify-generated-docs.sh - - PATH=./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh + - ./hack/verify-swagger-spec.sh - ./hack/verify-linkcheck.sh script: