diff options
| author | Michel Dänzer <[email protected]> | 2020-03-12 12:29:40 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2020-03-17 11:20:23 +0100 |
| commit | c56f09124b195c5cbaabdd7eadbb0523bede3abb (patch) | |
| tree | 62cbf40e1a4ef8f05ec62d16a1f186211de9ae36 /.gitlab-ci.yml | |
| parent | c3727ae431a132c1334884675f9c6c64ea6472b2 (diff) | |
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 <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4166>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 76f826e47cf..c89b5cdb269 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -265,7 +265,7 @@ meson-testing: - .gitlab-ci/meson-build.sh - .gitlab-ci/prepare-artifacts.sh -meson-main: +meson-gallium: extends: .meson-build variables: UNWIND: "true" @@ -274,7 +274,6 @@ meson-main: -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 @@ meson-main: - .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 @@ meson-vulkan: -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 |