From 1317b3e8ce4b6325f0b04ef525ded9272ec8e407 Mon Sep 17 00:00:00 2001 From: Kaihang Zhang Date: Mon, 27 Feb 2023 19:44:59 +0800 Subject: [PATCH] chore: Bump cloud-hypervisor to v30.0 --- build/virt-prerunner/Dockerfile | 8 ++++---- cmd/cloud-hypervisor-client-gen/main.go | 3 +-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/build/virt-prerunner/Dockerfile b/build/virt-prerunner/Dockerfile index ad6dbb5..daaa947 100644 --- a/build/virt-prerunner/Dockerfile +++ b/build/virt-prerunner/Dockerfile @@ -20,13 +20,13 @@ RUN set -eux; \ mkdir /var/lib/cloud-hypervisor; \ case "$(uname -m)" in \ 'x86_64') \ - curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v28.0/cloud-hypervisor-static; \ - curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v28.0/ch-remote-static; \ + curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v30.0/cloud-hypervisor-static; \ + curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v30.0/ch-remote-static; \ curl -sLo /var/lib/cloud-hypervisor/hypervisor-fw https://github.com/cloud-hypervisor/rust-hypervisor-firmware/releases/download/0.4.0/hypervisor-fw; \ ;; \ 'aarch64') \ - curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v28.0/cloud-hypervisor-static-aarch64; \ - curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v28.0/ch-remote-static-aarch64; \ + curl -sLo /usr/bin/cloud-hypervisor https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v30.0/cloud-hypervisor-static-aarch64; \ + curl -sLo /usr/bin/ch-remote https://github.com/cloud-hypervisor/cloud-hypervisor/releases/download/v30.0/ch-remote-static-aarch64; \ curl -sLo /var/lib/cloud-hypervisor/CLOUDHV_EFI.fd https://github.com/smartxworks/cloud-hypervisor-edk2-builder/releases/download/20220706/CLOUDHV_EFI.fd; \ ;; \ *) echo >&2 "error: unsupported architecture '$(uname -m)'"; exit 1 ;; \ diff --git a/cmd/cloud-hypervisor-client-gen/main.go b/cmd/cloud-hypervisor-client-gen/main.go index a170d74..a3693d9 100644 --- a/cmd/cloud-hypervisor-client-gen/main.go +++ b/cmd/cloud-hypervisor-client-gen/main.go @@ -18,8 +18,7 @@ import ( var clientTemplate string func main() { - // TODO: Use stable release includes patch https://github.com/cloud-hypervisor/cloud-hypervisor/commit/3dd01443d51b7d669ca770ae78fd2a01e9d103b7 - resp, err := http.Get("https://raw.githubusercontent.com/cloud-hypervisor/cloud-hypervisor/3dd01443d51b7d669ca770ae78fd2a01e9d103b7/vmm/src/api/openapi/cloud-hypervisor.yaml") + resp, err := http.Get("https://raw.githubusercontent.com/cloud-hypervisor/cloud-hypervisor/v30.0/vmm/src/api/openapi/cloud-hypervisor.yaml") if err != nil { panic(err) }