Skip to content

K
k3s
Commit a503bb82 authored by k8s-merge-robot's avatar k8s-merge-robot
Browse files
Options

Merge pull request #24653 from gtank/go-devel-builds

Automatic merge from submit-queue hack: allow devel builds of go This is issue https://github.com/kubernetes/kubernetes/issues/6913. It seems reasonable that someone running a devel build is responsible for making sure it's a sane version. <!-- Reviewable:start --> --- This change is [<img src="http://reviewable.k8s.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](http://reviewable.k8s.io/reviews/kubernetes/kubernetes/24653) <!-- Reviewable:end -->
parents 4c87df0a 8b507d8c
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
hack/lib/golang.sh
View file @ a503bb82
...@@ -272,7 +272,7 @@ EOF ...@@ -272,7 +272,7 @@ EOF
if [[ "${TRAVIS:-}" != "true" ]]; then if [[ "${TRAVIS:-}" != "true" ]]; then
local go_version local go_version
go_version=($(go version)) go_version=($(go version))
if [[ "${go_version[2]}" < "go1.6" ]]; then if [[ "${go_version[2]}" < "go1.6" && "${go_version[2]}" != "devel" ]]; then
kube::log::usage_from_stdin <<EOF kube::log::usage_from_stdin <<EOF
Detected go version: ${go_version[*]}. Detected go version: ${go_version[*]}.
Kubernetes requires go version 1.6 or greater. Kubernetes requires go version 1.6 or greater.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment