Skip to content

K
k3s
Commit fc37221d authored by Spyros Trigazis's avatar Spyros Trigazis Committed by Spyros Trigazis
Browse files
Options

Fix comparison of golang versions

Change hack/lib/golang.sh to compare golang version properly with "sort -s -t. -k 1,1 -k 2,2n -k 3,3n", which sorts key by key and not as strings.
parent f6d0632b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
hack/lib/golang.sh
View file @ fc37221d
...@@ -323,7 +323,7 @@ EOF ...@@ -323,7 +323,7 @@ EOF
go_version=($(go version)) go_version=($(go version))
local minimum_go_version local minimum_go_version
minimum_go_version=go1.9.1 minimum_go_version=go1.9.1
if [[ "${go_version[2]}" < "${minimum_go_version}" && "${go_version[2]}" != "devel" ]]; then if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${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 ${minimum_go_version} or greater. Kubernetes requires ${minimum_go_version} 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