From b6e8a3be1bacba333ab0d9906aa3932f293b8932 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Wed, 20 Oct 2021 16:29:58 -0700 Subject: [PATCH] directly code golang version --- hack/jenkins/installers/check_install_golang.sh | 2 +- hack/update/golang_version/update_golang_version.go | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index e47055364b..b341ea77b4 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=$(grep '^GO_VERSION' Makefile | awk '{ print $3 }') +VERSION_TO_INSTALL=1.17.2 INSTALL_PATH=${1} function current_arch() { diff --git a/hack/update/golang_version/update_golang_version.go b/hack/update/golang_version/update_golang_version.go index 255a5305ff..b7d75cc178 100644 --- a/hack/update/golang_version/update_golang_version.go +++ b/hack/update/golang_version/update_golang_version.go @@ -118,6 +118,11 @@ var ( `GO_K8S_VERSION_PREFIX \?= v1.*`: `GO_K8S_VERSION_PREFIX ?= {{.K8SVersion}}`, }, }, + "hack/jenkins/installers/check_install_golang.sh": { + Replace: map[string]string{ + `VERSION_TO_INSTALL=.*`: `VERSION_TO_INSTALL={{.StableVersion}}`, + }, + }, } // PR data