Module: Mesa Branch: main Commit: bc9fe6637b37078d9f3126977cb55082a6871b7c URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc9fe6637b37078d9f3126977cb55082a6871b7c
Author: Karol Herbst <[email protected]> Date: Sat Dec 23 15:45:02 2023 +0100 ci: merge debian-rusticl-testing into debian-testing There is really no point anymore having it split out. Signed-off-by: Karol Herbst <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26807> --- .gitlab-ci/build/gitlab-ci.yml | 23 +---------------------- src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml | 2 +- 2 files changed, 2 insertions(+), 23 deletions(-) diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml index 2913a3389e4..782c5a57c71 100644 --- a/.gitlab-ci/build/gitlab-ci.yml +++ b/.gitlab-ci/build/gitlab-ci.yml @@ -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: diff --git a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml index bc9b685ffb0..318a0b7ac50 100644 --- a/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml +++ b/src/gallium/drivers/llvmpipe/ci/gitlab-ci.yml @@ -6,7 +6,7 @@ llvmpipe-piglit-rusticl: - .llvmpipe-piglit-cl - .llvmpipe-rusticl-rules needs: - - debian-rusticl-testing + - debian-testing - debian/x86_64_test-gl variables: RUSTICL_ENABLE: "llvmpipe"
