Module: Mesa
Branch: main
Commit: ef217a92217392d7ed08eb5112d7e5e29d80d407
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef217a92217392d7ed08eb5112d7e5e29d80d407

Author: David Heidelberg <david.heidelb...@collabora.com>
Date:   Sun Oct 22 12:14:07 2023 +0200

ci: simplify debian-rusticl-testing definition

This was originally split due testing both rusticl and clover.

Reviewed-by: Martin Roukala <martin.rouk...@mupuf.org>
Signed-off-by: David Heidelberg <david.heidelb...@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25843>

---

 .gitlab-ci/build/gitlab-ci.yml | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/.gitlab-ci/build/gitlab-ci.yml b/.gitlab-ci/build/gitlab-ci.yml
index 2886de9ceeb..002b0495375 100644
--- a/.gitlab-ci/build/gitlab-ci.yml
+++ b/.gitlab-ci/build/gitlab-ci.yml
@@ -133,32 +133,27 @@ 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-cl-testing:
+debian-rusticl-testing:
   extends:
     - .meson-build
     - .ci-deqp-artifacts
   variables:
+    BUILDTYPE: "debugoptimized"
+    EXTRA_OPTION: >
+      -D valgrind=disabled
     LLVM_VERSION: 15
-    UNWIND: "enabled"
     DRI_LOADERS: >
       -D glx=disabled
       -D egl=disabled
       -D gbm=disabled
     GALLIUM_DRIVERS: "swrast"
-    BUILDTYPE: "debugoptimized"
-    EXTRA_OPTION: >
-      -D valgrind=disabled
-  script:
-    - .gitlab-ci/meson/build.sh
-    - .gitlab-ci/prepare-artifacts.sh
-
-debian-rusticl-testing:
-  extends:
-    - .debian-cl-testing
-  variables:
     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

Reply via email to