From f5048b725badf3f810835a240b5f53a547f16cb4 Mon Sep 17 00:00:00 2001 From: Hui Zhu Date: Sat, 10 Nov 2018 10:29:16 +0000 Subject: [PATCH] golang.mk: Check and install yq before use it golang.mk call yq to get golang_version_min but some environments do not install it. This patch check and install yq before use it to handle the issue. Fixes #899 Signed-off-by: Hui Zhu --- golang.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/golang.mk b/golang.mk index 95259d192..4f47462c2 100644 --- a/golang.mk +++ b/golang.mk @@ -6,7 +6,14 @@ # Check that the system golang version is within the required version range # for this project. -golang_version_min=$(shell yq r versions.yaml languages.golang.version) +have_yq=$(shell if [ -x "$(GOPATH)/bin/yq" ]; then echo "true"; else echo ""; fi) +ifeq (,$(have_yq)) + install_yq=$(shell .ci/install-yq.sh) +endif +ifneq (,$(install_yq)) + $(error "ERROR: install yq failed") +endif +golang_version_min=$(shell $(GOPATH)/bin/yq r versions.yaml languages.golang.version) ifeq (,$(golang_version_min)) $(error "ERROR: cannot determine minimum golang version")