Merge pull request kubernetes#1176 from brendandburns/travis

Re-enable travis for Go tip
duda · Sep 4, 2014 · 512b0ab · 512b0ab
2 parents 779de73 + 53e3bff
commit 512b0ab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,6 +1,7 @@
 language: go
 
 go:
+  - tip
   - 1.3
   - 1.2
 

diff --git a/hack/test-go.sh b/hack/test-go.sh
@@ -44,6 +44,11 @@ find_test_pkgs() {
   find_test_dirs | xargs -n1 printf "${KUBE_GO_PACKAGE}/%s\n"
 }
 
+# there is currently a race in the coverage code in tip.  Remove this when it is fixed
+# see https://code.google.com/p/go/issues/detail?id=8630 for details.
+if [[ ${TRAVIS_GO_VERSION} eq "tip" ]]; then
+  KUBE_COVER=""
+fi
 # -covermode=atomic becomes default with -race in Go >=1.3
 KUBE_COVER=${KUBE_COVER:--cover -covermode=atomic}
 KUBE_TIMEOUT=${KUBE_TIMEOUT:--timeout 30s}
-Original file line number
+Diff line change
@@ -1,6 +1,7 @@
     language: go
     go:
+      - tip
       - 1.3
       - 1.2
@@ Expand Down @@