ci: merge debian-rusticl-testing into debian-testing

There is really no point anymore having it split out.

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26807>
This commit is contained in:
Karol Herbst
2023-12-23 15:45:02 +01:00
committed by Marge Bot
parent 6d4577799c
commit bc9fe6637b
2 changed files with 2 additions and 23 deletions

View File

@@ -75,6 +75,7 @@ debian-testing:
GALLIUM_ST: >
-D dri3=enabled
-D gallium-va=enabled
-D gallium-rusticl=true
GALLIUM_DRIVERS: "swrast,virgl,radeonsi,zink,crocus,iris,i915"
VULKAN_DRIVERS: "swrast,amd,intel,intel_hasvk,virtio,nouveau-experimental"
BUILDTYPE: "debugoptimized"
@@ -124,28 +125,6 @@ debian-testing-msan:
GALLIUM_DRIVERS: "freedreno,iris,nouveau,kmsro,r300,r600,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12,crocus"
VULKAN_DRIVERS: intel,amd,broadcom,virtio
debian-rusticl-testing:
extends:
- .meson-build
- .ci-deqp-artifacts
variables:
BUILDTYPE: "debugoptimized"
EXTRA_OPTION: >
-D valgrind=disabled
LLVM_VERSION: 15
DRI_LOADERS: >
-D glx=disabled
-D egl=disabled
-D gbm=disabled
GALLIUM_DRIVERS: "swrast"
GALLIUM_ST: >
-D gallium-rusticl=true
-D opencl-spirv=true
UNWIND: "enabled"
script:
- .gitlab-ci/meson/build.sh
- .gitlab-ci/prepare-artifacts.sh
debian-build-testing:
extends: .meson-build
variables: