From 5ac14a97e27dbadff42bc409d818bc1b8803bf65 Mon Sep 17 00:00:00 2001 From: Omar Akkila Date: Fri, 30 Jul 2021 14:48:43 +0200 Subject: [PATCH] ci: Enable virtio-experimental in testing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Enable building the virtio vulkan (venus) driver. Co-authored-by: Corentin Noël Signed-off-by: Omar Akkila Acked-by: David Heidelberg Part-of: --- .gitlab-ci/build/gitlab-ci.yml | 2 +- .gitlab-ci/container/build-crosvm.sh | 2 +- .gitlab-ci/image-tags.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index bf4ea87..4353056 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -78,7 +78,7 @@ debian-testing: -D dri3=enabled -D gallium-va=enabled GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915" - VULKAN_DRIVERS: "swrast,amd,intel" + VULKAN_DRIVERS: "swrast,amd,intel,virtio-experimental" BUILDTYPE: "debugoptimized" EXTRA_OPTION: > -D spirv-to-dxil=true diff --git a/.gitlab-ci/container/build-crosvm.sh b/.gitlab-ci/container/build-crosvm.sh index 467d0aa..1004ea1 100644 --- a/.gitlab-ci/container/build-crosvm.sh +++ b/.gitlab-ci/container/build-crosvm.sh @@ -20,7 +20,7 @@ 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/ $EXTRA_MESON_ARGS +meson build/ -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 3988011..5261341 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: "2022-08-04-crosvm-opaque-fd" + DEBIAN_BASE_TAG: "2022-08-04-venus-ci" DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build" DEBIAN_BUILD_TAG: "2022-07-14-directx-headers" -- 2.7.4