Skip to content

K
k3s
Unverified Commit 641856db authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #75530 from logicalhan/automated-cherry-pick-of-#75529-upstream-release-1.14

Automated cherry pick of #75529: bump required minimum go version to 1.12.1 (strings pkg compatibility)
parents 82481fad 98f94d83
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
hack/lib/golang.sh
View file @ 641856db
...@@ -382,7 +382,7 @@ EOF ...@@ -382,7 +382,7 @@ EOF
local go_version local go_version
IFS=" " read -ra go_version <<< "$(go version)" IFS=" " read -ra go_version <<< "$(go version)"
local minimum_go_version local minimum_go_version
minimum_go_version=go1.11.1 minimum_go_version=go1.12.1
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 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[*]}.
......
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