Update travis and shippable to have less needless cruft

It looks like there are places where things were needed for one command were being just needlessly copied. Which made the files harder to recognize what mattered and what didn't...

Update travis and shippable to have less needless cruft
df988704 · Eric Paris · 9fdd7935 · df988704 · df988704
Commit df988704 authored Aug 11, 2015 by Eric Paris
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 13 deletions

.travis.yml .travis.yml +5 -6

shippable.yml shippable.yml +7 -7

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,12 +15,11 @@ script:
  - ./hack/verify-gofmt.sh
  - ./hack/verify-boilerplate.sh
  - ./hack/verify-description.sh
-  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-conversions.sh
+  - ./hack/verify-generated-conversions.sh
-  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-deep-copies.sh
+  - ./hack/verify-generated-deep-copies.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-generated-docs.sh
+  - ./hack/verify-generated-docs.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
+  - PATH=./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-linkcheck.sh
+  - ./hack/verify-linkcheck.sh
-  - godep go test ./cmd/mungedocs
 notifications:
  irc: "chat.freenode.net#kubernetes-dev"
--- a/shippable.yml
+++ b/shippable.yml
@@ -23,18 +23,18 @@ install:
  - go get golang.org/x/tools/cmd/cover
  - go get github.com/mattn/goveralls
  - go get github.com/tools/godep
+  - ./hack/build-go.sh
+  - PATH=$GOPATH/bin:$PATH godep go install ./...
  - ./hack/travis/install-etcd.sh
  - ./hack/verify-gofmt.sh
  - ./hack/verify-boilerplate.sh
  - ./hack/verify-description.sh
  - ./hack/travis/install-std-race.sh
-  - ./hack/build-go.sh
+  - ./hack/verify-generated-conversions.sh
-  - PATH=$GOPATH/bin:$PATH godep go install ./...
+  - ./hack/verify-generated-deep-copies.sh
-  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-conversions.sh
+  - ./hack/verify-generated-docs.sh
-  - PATH=$GOPATH/bin:$PATH ./hack/verify-generated-deep-copies.sh
+  - PATH=./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-generated-docs.sh
+  - ./hack/verify-linkcheck.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-swagger-spec.sh
-  - PATH=$GOPATH/bin:./third_party/etcd:$PATH ./hack/verify-linkcheck.sh
 script:
  - KUBE_RACE="-race" KUBE_COVER="y" KUBE_GOVERALLS_BIN="$HOME/gopath/bin/goveralls" KUBE_TIMEOUT='-timeout 300s' KUBE_COVERPROCS=8 KUBE_TEST_ETCD_PREFIXES="${KUBE_TEST_ETCD_PREFIXES}" KUBE_TEST_API_VERSIONS="${KUBE_TEST_API_VERSIONS}" ./hack/test-go.sh -- -p=2