From 037dbeb67874d2fd4e98e7d6a0604b503f683b0b Mon Sep 17 00:00:00 2001 From: Andrew Chen Date: Mon, 24 Jul 2017 15:36:44 -0700 Subject: [PATCH] update .travis.yml --- .travis.yml | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/.travis.yml b/.travis.yml index 691d897659..6d889f3c23 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: go go: - - 1.7.3 + - 1.8.1 # Don't want default ./... here: install: @@ -11,23 +11,9 @@ install: # (1) Fetch dependencies for us to run the tests in test/examples_test.go - go get -t -v k8s.io/kubernetes.github.io/test -# The dependencies are complicated for test/examples_test.go -# k8s.io/kubernetes/pkg is a dependency, which in turn depends on apimachinery -# but we also have apimachinery directly as one of our dependencies, which causes a conflict. -# Additionally, we get symlinks when we clone the directory. The below steps do the following: - -# (a) Replace the symlink with the actual dependencies from kubernetes/staging/src/ -# (b) copy all the vendored files to $GOPATH/src -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apimachinery -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/apiserver -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/client-go -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/sample-apiserver -- rm $GOPATH/src/k8s.io/kubernetes/vendor/k8s.io/kube-aggregator -- cp -r $GOPATH/src/k8s.io/kubernetes/vendor/* $GOPATH/src/ -- rm -rf $GOPATH/src/k8s.io/kubernetes/vendor/* -- cp -r $GOPATH/src/k8s.io/kubernetes/staging/src/* $GOPATH/src/ -- cp -r $GOPATH/src/k8s.io/apimachinery/vendor/* $GOPATH/src/ -- rm -rf $GOPATH/src/k8s.io/apimachinery/vendor/* +# Simplified deduplication of dependencies. +- cp -L -R $GOPATH/src/k8s.io/kubernetes/vendor/ $GOPATH/src/ +- rm -r $GOPATH/src/k8s.io/kubernetes/vendor/ # (2) Fetch md-check along with all its dependencies. - git clone --depth=50 --branch=master https://github.com/kubernetes/md-check $HOME/gopath/src/k8s.io/md-check