gitlab-ci: Move classic driver testing to a new meson-classic job
The motivation is to allow llvmpipe to be enabled instead in the
meson-i386 job.
v2: (Eric Engestrom)
* Rename meson-main job to meson-gallium
* Remove stale comment above meson-i386 job
Reviewed-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4166>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76f826e..c89b5cd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -265,7 +265,7 @@
- .gitlab-ci/meson-build.sh
- .gitlab-ci/prepare-artifacts.sh
-meson-main:
+meson-gallium:
extends: .meson-build
variables:
UNWIND: "true"
@@ -274,7 +274,6 @@
-D gbm=true
-D egl=true
-D platforms=x11,wayland,drm,surfaceless
- DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
GALLIUM_ST: >
-D dri3=true
-D gallium-extra-hud=true
@@ -293,6 +292,20 @@
- .gitlab-ci/meson-build.sh
- .gitlab-ci/run-shader-db.sh
+meson-classic:
+ extends: .meson-build
+ variables:
+ UNWIND: "true"
+ DRI_LOADERS: >
+ -D glx=dri
+ -D gbm=true
+ -D egl=true
+ -D platforms=x11,wayland,drm,surfaceless
+ DRI_DRIVERS: "auto"
+ EXTRA_OPTION: >
+ -D osmesa=classic
+ -D tools=all
+
.meson-cross:
extends:
- .meson-build
@@ -458,19 +471,14 @@
-D vulkan-overlay-layer=true
-D werror=true
-# While the main point of this build is testing the i386 cross build,
-# we also use this one to test some other options that are exclusive
-# with meson-main's choices (classic swrast and osmesa)
meson-i386:
extends: .meson-cross
variables:
CROSS: i386
VULKAN_DRIVERS: intel,amd
- DRI_DRIVERS: "swrast"
GALLIUM_DRIVERS: "iris"
EXTRA_OPTION: >
-D vulkan-overlay-layer=true
- -D osmesa=classic
-D werror=true
script:
- dpkg -i /var/cache/apt/archives/$CROSS/*.deb