From 9fbfd9aefc506d3a8fd150ac02f158192e75148d Mon Sep 17 00:00:00 2001 From: xuzhonghu Date: Wed, 11 Sep 2019 15:35:51 +0800 Subject: [PATCH] bump golang version to 1.13.x and kind to v0.5.0 --- .travis.yml | 6 +++--- hack/lib/golang.sh | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 66aec6b2fb..6434bc69c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ dist: xenial language: go go: - - '1.11.x' + - '1.13.x' sudo: required env: - HOME=/home/travis @@ -31,8 +31,8 @@ jobs: - echo "deb https://apt.kubernetes.io/ kubernetes-xenial main" | sudo tee -a /etc/apt/sources.list.d/kubernetes.list - sudo apt-get update - sudo apt-get install -y kubectl - # Download kind binary (0.2.0) - - sudo curl -o /usr/local/bin/kind -L https://github.com/kubernetes-sigs/kind/releases/download/v0.4.0/kind-linux-amd64 + # Download kind binary (0.5.0) + - sudo curl -o /usr/local/bin/kind -L https://github.com/kubernetes-sigs/kind/releases/download/v0.5.0/kind-linux-amd64 - sudo chmod +x /usr/local/bin/kind script: - make vcctl diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 55b4b890cd..2813d70108 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -328,7 +328,7 @@ EOF local go_version go_version=($(go version)) local minimum_go_version - minimum_go_version=go1.8.3 + minimum_go_version=go1.12.1 if [[ "kube::golang::version_gt "${go_version[2]}" "${minimum_go_version}"" == 1 && "${go_version[2]}" != "devel" ]]; then kube::log::usage_from_stdin <