diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index e5a90c32..00000000 --- a/.travis.yml +++ /dev/null @@ -1,12 +0,0 @@ -language: go -sudo: false -go: - - 1.5.3 -install: - - true -before_script: - - go get golang.org/x/tools/cmd/vet - - go get github.com/kr/godep -script: - - export PATH=$PATH:$HOME/gopath/bin - - ./build/presubmit.sh diff --git a/Makefile b/Makefile index de9c56d2..5c127f63 100644 --- a/Makefile +++ b/Makefile @@ -10,6 +10,7 @@ # distributed under the License is distributed on an "AS IS" BASIS, # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and +# limitations under the License. GO := go pkgs = $(shell $(GO) list ./... | grep -v vendor) diff --git a/README.md b/README.md index f7af4765..de4c718e 100644 --- a/README.md +++ b/README.md @@ -60,4 +60,4 @@ cAdvisor aims to improve the resource usage and performance characteristics of r ## Community -Contributions, questions, and comments are all welcomed and encouraged! cAdvisor developers hang out on [Slack](https://kubernetes.slack.com) in the #sig-node channel (get an invitation [here](http://slack.kubernetes.io/)). We also have the [google-containers Google Groups mailing list](https://groups.google.com/forum/#!forum/google-containers). +Contributions, questions, and comments are all welcomed and encouraged! cAdvisor developers hang out on [Slack](https://kubernetes.slack.com) in the #sig-node channel (get an invitation [here](http://slack.kubernetes.io/)). We also have the [kubernetes-users Google Groups mailing list](https://groups.google.com/forum/#!forum/kubernetes-users). diff --git a/build/jenkins_e2e.sh b/build/jenkins_e2e.sh index bd895003..36e4a49b 100755 --- a/build/jenkins_e2e.sh +++ b/build/jenkins_e2e.sh @@ -31,7 +31,7 @@ if [[ ! -z "$(git diff --name-only pages)" ]]; then exit 1 fi -# Build & test with go 1.7 +# Build & test with go 1.8 docker run --rm \ -w "/go/src/github.com/google/cadvisor" \ -v "${GOPATH}/src/github.com/google/cadvisor:/go/src/github.com/google/cadvisor" \