From a19cb7cff4ef00dffde59df39e2f1b773bcea08b Mon Sep 17 00:00:00 2001 From: Nan Monnand Deng Date: Fri, 13 Jun 2014 14:59:47 -0400 Subject: [PATCH 1/5] fix ci --- .travis.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index b1276692..e0c7281f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,9 @@ language: go go: - 1.1 + - 1.2 +install: + - go get -u github.com/google/cadvisor script: - go test -v -race github.com/google/cadvisor/container - go test -v -race github.com/google/cadvisor/info From 8d169397b0b44b85b06cb05bc3eb74a911abf588 Mon Sep 17 00:00:00 2001 From: Nan Monnand Deng Date: Fri, 13 Jun 2014 15:09:12 -0400 Subject: [PATCH 2/5] works? --- .travis.yml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index e0c7281f..c9c735f3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,14 @@ language: go go: - - 1.1 - 1.2 -install: - - go get -u github.com/google/cadvisor +# install: +# - go get -u github.com/google/cadvisor +# - go get github.com/stretchr/testify/mock +# - go get github.com/docker/libcontainer/cgroups +# - go get github.com/docker/libcontainer/cgroups/fs +# - go get github.com/fsouza/go-dockerclient +# - go get github.com/kr/pretty +# - go get github.com/dotcloud/docker/nat script: - go test -v -race github.com/google/cadvisor/container - go test -v -race github.com/google/cadvisor/info From 02a8f0b16498efcf2a397cde4702e6d4e3d1a323 Mon Sep 17 00:00:00 2001 From: Nan Monnand Deng Date: Fri, 13 Jun 2014 15:15:42 -0400 Subject: [PATCH 3/5] added all dependencies --- .travis.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index c9c735f3..e78481ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,14 @@ language: go go: - 1.2 -# install: -# - go get -u github.com/google/cadvisor -# - go get github.com/stretchr/testify/mock -# - go get github.com/docker/libcontainer/cgroups -# - go get github.com/docker/libcontainer/cgroups/fs -# - go get github.com/fsouza/go-dockerclient -# - go get github.com/kr/pretty -# - go get github.com/dotcloud/docker/nat +before_script:: + - go get -u github.com/google/cadvisor + - go get github.com/stretchr/testify/mock + - go get github.com/docker/libcontainer/cgroups + - go get github.com/docker/libcontainer/cgroups/fs + - go get github.com/fsouza/go-dockerclient + - go get github.com/kr/pretty + - go get github.com/dotcloud/docker/nat script: - go test -v -race github.com/google/cadvisor/container - go test -v -race github.com/google/cadvisor/info From 26597cf9bc3409b29e6bf1ff8da8af135c00eea0 Mon Sep 17 00:00:00 2001 From: Nan Monnand Deng Date: Fri, 13 Jun 2014 15:16:25 -0400 Subject: [PATCH 4/5] dependencies are only dependencies of unit tests --- .travis.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e78481ec..88173d21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,14 +1,9 @@ language: go go: - 1.2 -before_script:: - - go get -u github.com/google/cadvisor +before_script: - go get github.com/stretchr/testify/mock - - go get github.com/docker/libcontainer/cgroups - - go get github.com/docker/libcontainer/cgroups/fs - - go get github.com/fsouza/go-dockerclient - go get github.com/kr/pretty - - go get github.com/dotcloud/docker/nat script: - go test -v -race github.com/google/cadvisor/container - go test -v -race github.com/google/cadvisor/info From 9ca05f1d32ef95d241e5b95c8a1142dd585fd11f Mon Sep 17 00:00:00 2001 From: Nan Monnand Deng Date: Fri, 13 Jun 2014 15:22:32 -0400 Subject: [PATCH 5/5] remove race detector --- .travis.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 88173d21..d3718380 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,7 +6,7 @@ before_script: - go get github.com/kr/pretty script: - go test -v -race github.com/google/cadvisor/container - - go test -v -race github.com/google/cadvisor/info - - go test -v -race github.com/google/cadvisor/client - - go test -v -race github.com/google/cadvisor/sampling - - go build -race github.com/google/cadvisor + - go test -v github.com/google/cadvisor/info + - go test -v github.com/google/cadvisor/client + - go test -v github.com/google/cadvisor/sampling + - go build github.com/google/cadvisor