ci: Update CrosVM and Virglrenderer

Update to their latest version on time

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33796>
This commit is contained in:
Corentin Noël
2025-02-27 11:20:38 +01:00
committed by Marge Bot
parent 288f932b78
commit 45e771f4fb
4 changed files with 11 additions and 9 deletions

View File

@@ -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=10d2f33440475cb1a96eba1dc27c59c8b57b68bd
CROSVM_VERSION=e27efaf8f4bdc4a47d1e99cc44d2b6908b6f36bd
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=5b116c35ae08897b4d5171d8ed4cb0e73fb18069
VIRGLRENDERER_VERSION=4a6af3135ca727dc158ec003dae7ca8571a7efb6
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
@@ -30,14 +30,14 @@ meson setup build/ -D libdir=lib -D render-server-worker=process -D venus=true $
meson install -C build
popd
cargo update -p pkg-config@0.3.26 --precise 0.3.27
rm rust-toolchain
RUSTFLAGS='-L native=/usr/local/lib' cargo install \
bindgen-cli \
--locked \
-j ${FDO_CI_CONCURRENT:-4} \
--root /usr/local \
--version 0.65.1 \
--version 0.71.1 \
${EXTRA_CARGO_ARGS:-}
CROSVM_USE_SYSTEM_MINIGBM=1 CROSVM_USE_SYSTEM_VIRGLRENDERER=1 RUSTFLAGS='-L native=/usr/local/lib' cargo install \

View File

@@ -27,7 +27,7 @@ rustup component add clippy rustfmt
# Set up a config script for cross compiling -- cargo needs your system cc for
# linking in cross builds, but doesn't know what you want to use for system cc.
cat > /root/.cargo/config <<EOF
cat > "$HOME/.cargo/config" <<EOF
[target.armv7-unknown-linux-gnueabihf]
linker = "arm-linux-gnueabihf-gcc"

View File

@@ -20,7 +20,7 @@ include:
variables:
DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
DEBIAN_BASE_TAG: "20250223-way-prot"
DEBIAN_BASE_TAG: "20250304-virglcrosvm"
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
DEBIAN_BUILD_TAG: "20250217-wrappers"
@@ -38,9 +38,9 @@ variables:
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20250217-wrappers"
DEBIAN_TEST_GL_TAG: "20250223-way-prot"
DEBIAN_TEST_VK_TAG: "20250223-way-prot"
KERNEL_ROOTFS_TAG: "20250228-imx8mp"
DEBIAN_TEST_GL_TAG: "20250304-virglcrosvm"
DEBIAN_TEST_VK_TAG: "20250304-virglcrosvm"
KERNEL_ROOTFS_TAG: "20250304-virglcrosvm"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20250129-lavacli"

View File

@@ -152,3 +152,5 @@ spec@arb_clip_control@arb_clip_control-depth-precision,Crash
spec@nv_texture_barrier@blending-in-shader,Crash
spec@arb_viewport_array@display-list,Fail
# Fails since uprev in https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33796
KHR-GL46.texture_view.coherency,Fail