github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-04 02:56:18 +00:00
Code Issues Projects Releases Wiki Activity

golang.mk: Check and install yq before use it

Browse Source 
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 <teawater@hyper.sh>
This commit is contained in:
Hui Zhu 2018-11-10 10:29:16 +00:00
parent ebd86d604e
commit f5048b725b
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
golang.mk
View File

@ -6,7 +6,14 @@
# Check that the system golang version is within the required version range # Check that the system golang version is within the required version range
# for this project. # 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)) ifeq (,$(golang_version_min))
$(error "ERROR: cannot determine minimum golang version") $(error "ERROR: cannot determine minimum golang version")