From b6917cd62aaa1282ed46d8442424b93991976a85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Corentin=20No=C3=ABl?= Date: Tue, 11 Feb 2025 17:55:52 +0100 Subject: [PATCH] ci: Update CrosVM and Virglrenderer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Update to their latest version on time Signed-off-by: Corentin Noël Part-of: --- .gitlab-ci/container/build-crosvm.sh | 4 ++-- .gitlab-ci/image-tags.yml | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 9adfcdaaa38..02efbf03814 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -15,13 +15,13 @@ uncollapsed_section_start crosvm "Building crosvm" git config --global user.email "mesa@example.com" git config --global user.name "Mesa CI" -CROSVM_VERSION=2118fbb57ca26b495a9aa407845c7729d697a24b +CROSVM_VERSION=10d2f33440475cb1a96eba1dc27c59c8b57b68bd git clone --single-branch -b main --no-checkout https://chromium.googlesource.com/crosvm/crosvm /platform/crosvm pushd /platform/crosvm git checkout "$CROSVM_VERSION" git submodule update --init -VIRGLRENDERER_VERSION=57a2b82e0958f08d02ade8400786e1ca0935c9b1 +VIRGLRENDERER_VERSION=5b116c35ae08897b4d5171d8ed4cb0e73fb18069 rm -rf third_party/virglrenderer git clone --single-branch -b main --no-checkout https://gitlab.freedesktop.org/virgl/virglrenderer.git third_party/virglrenderer pushd third_party/virglrenderer diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 5a5222e8809..eaa29a18875 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -13,7 +13,7 @@ variables: DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base" - DEBIAN_BASE_TAG: "20250218-rustup" + DEBIAN_BASE_TAG: "20250219-virglcrosvm" DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build" DEBIAN_BUILD_TAG: "20250210-android-drm" @@ -31,9 +31,9 @@ variables: DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android" DEBIAN_TEST_ANDROID_TAG: "20250212-up-angle" - DEBIAN_TEST_GL_TAG: "20250215-add-angle" - DEBIAN_TEST_VK_TAG: "20250204-fix-deqp" - KERNEL_ROOTFS_TAG: "20250212-up-angle" + DEBIAN_TEST_GL_TAG: "20250219-virglcrosvm" + DEBIAN_TEST_VK_TAG: "20250219-virglcrosvm" + KERNEL_ROOTFS_TAG: "20250219-virglcrosvm" DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils" DEBIAN_PYUTILS_TAG: "20250129-lavacli"