mirror of https://github.com/k3s-io/k3s
Merge pull request #30385 from david-mcmahon/fix-cache
Automatic merge from submit-queue Get version from started.json. <!-- Reviewable:start --> This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30385) <!-- Reviewable:end -->pull/6/head
commit
16c71aad4a
|
@ -94,6 +94,10 @@ function find_version() {
|
||||||
source "hack/lib/version.sh"
|
source "hack/lib/version.sh"
|
||||||
kube::version::get_version_vars
|
kube::version::get_version_vars
|
||||||
echo "${KUBE_GIT_VERSION-}"
|
echo "${KUBE_GIT_VERSION-}"
|
||||||
|
else
|
||||||
|
# Last resort from the started.json
|
||||||
|
gsutil cat ${gcs_build_path}/started.json 2>/dev/null |\
|
||||||
|
sed -n 's/ *"version": *"\([^"]*\)",*/\1/p'
|
||||||
fi
|
fi
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue