From efb611aa6512e8b61c4ea8e2c75ab6cd995adcd2 Mon Sep 17 00:00:00 2001 From: Jose Carlos Venegas Munoz Date: Tue, 10 Dec 2019 19:53:37 +0000 Subject: [PATCH] clh: client: update acording to versions.yaml Instead of point to master use the version defined in versions.yaml Fixes: #2341 Signed-off-by: Jose Carlos Venegas Munoz --- virtcontainers/pkg/cloud-hypervisor/Makefile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/virtcontainers/pkg/cloud-hypervisor/Makefile b/virtcontainers/pkg/cloud-hypervisor/Makefile index 65f504e175..5f89c27312 100644 --- a/virtcontainers/pkg/cloud-hypervisor/Makefile +++ b/virtcontainers/pkg/cloud-hypervisor/Makefile @@ -5,6 +5,10 @@ # all: | update-yaml generate-client-code +MK_DIR := $(dir $(realpath $(firstword $(MAKEFILE_LIST)))) +YQ_INSTALLER := "$(MK_DIR)/../../../.ci/install-yq.sh" +VERSIONS_FILE := "$(MK_DIR)/../../../versions.yaml" +YQ := $(shell command -v yq 2> /dev/null) generate-client-code: clean-generated-code docker run --rm \ @@ -14,8 +18,14 @@ generate-client-code: clean-generated-code -g go \ -o /local/client + + update-yaml: - curl -OL https://raw.githubusercontent.com/cloud-hypervisor/cloud-hypervisor/master/vmm/src/api/openapi/cloud-hypervisor.yaml +ifndef YQ + $(MK_DIR)/../../../.ci/install-yq.sh +endif + clh_version=$(shell yq r $(VERSIONS_FILE) assets.hypervisor.cloud_hypervisor.version); \ + curl -OL https://raw.githubusercontent.com/cloud-hypervisor/cloud-hypervisor/$$clh_version/vmm/src/api/openapi/cloud-hypervisor.yaml clean-generated-code: rm "./client" -rf