From 74967249d27aba0312e37e903df983b88cce4200 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Thu, 26 Jan 2023 16:32:15 +0100 Subject: [PATCH] ci: uprev virglrenderer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change contains a memory unmap fix and makes the render server mandatory. Signed-off-by: Corentin Noël Reviewed-by: Yiwei Zhang Part-of: --- .gitlab-ci/container/build-crosvm.sh | 4 ++-- .gitlab-ci/image-tags.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 1818764d61d..d72ac874405 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -12,12 +12,12 @@ pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=3f2685355f71201f22b98c19aa778b43732c8435 +VIRGLRENDERER_VERSION=fe92a14ab251c2ef7e0640232f15197d3253a8eb rm -rf third_party/virglrenderer git clone --single-branch -b master --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer git checkout "$VIRGLRENDERER_VERSION" -meson build/ -Drender-server=true -Drender-server-worker=process -Dvenus-experimental=true $EXTRA_MESON_ARGS +meson build/ -Drender-server-worker=process -Dvenus-experimental=true $EXTRA_MESON_ARGS ninja -C build install popd diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 0e53149f419..518f96b9996 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -1,6 +1,6 @@ variables: DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base" - DEBIAN_BASE_TAG: "2023-01-20-kernel-6.1-439f86d0" + DEBIAN_BASE_TAG: "2023-01-26-virglrenderer" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2023-01-24-android" @@ -21,7 +21,7 @@ variables: ALPINE_X86_BUILD_TAG: "2023-01-20-all-in-1" FEDORA_X86_BUILD_TAG: "2023-01-20-all-in-1" - KERNEL_ROOTFS_TAG: "2023-01-20-kernel-6.1-439f86d0" + KERNEL_ROOTFS_TAG: "2023-01-26-virglrenderer" WINDOWS_X64_VS_PATH: "windows/x64_vs" WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"