Skip to content

Commit

Permalink
Merge pull request #444 from hzxuzhonghu/upgrade
Browse files Browse the repository at this point in the history
bump golang version to 1.13.x and kind to v0.5.0 in ci
  • Loading branch information
volcano-sh-bot committed Sep 11, 2019
2 parents a7cfcec + 9fbfd9a commit 73d3a7b
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dist: xenial
language: go
go:
- '1.11.x'
- '1.13.x'
sudo: required
env:
- HOME=/home/travis
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion hack/lib/golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF
Detected go version: ${go_version[*]}.
Expand Down

0 comments on commit 73d3a7b

Please sign in to comment.