CI: Collapse llvmpipe & softpipe stages into one

This is now called 'software-renderer'.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Acked-by: Eric Anholt <eric@anholt.net>
Acked-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7873>
This commit is contained in:
Daniel Stone 2020-12-02 13:50:38 +00:00 committed by Marge Bot
parent 4d7c848053
commit d5bf4c99f6
2 changed files with 4 additions and 5 deletions

View File

@ -25,8 +25,7 @@ stages:
- deploy
- meson-x86_64
- build-misc
- llvmpipe
- softpipe
- software-renderer
- freedreno
- panfrost
- radv

View File

@ -47,7 +47,7 @@
when: never
.softpipe-rules:
stage: softpipe
stage: software-renderer
rules:
- *ignore_scheduled_pipelines
- changes:
@ -63,7 +63,7 @@
- when: never
.llvmpipe-rules:
stage: llvmpipe
stage: software-renderer
rules:
- *ignore_scheduled_pipelines
- changes:
@ -79,7 +79,7 @@
- when: never
.llvmpipe-cl-rules:
stage: llvmpipe
stage: software-renderer
rules:
- *ignore_scheduled_pipelines
- changes: