CI: Collapse lima & panfrost stages into one

This is now called 'arm'; even though they're two separate drivers, it
does help cut down on some of the more egregious horizontal scrolling.

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 5673322745
commit 220a467b7f
2 changed files with 4 additions and 5 deletions

View File

@ -26,10 +26,9 @@ stages:
- meson-x86_64
- build-misc
- software-renderer
- freedreno
- panfrost
- lima
- amd
- arm
- freedreno
- layered-backends
- success

View File

@ -131,7 +131,7 @@
- when: never
.panfrost-rules:
stage: panfrost
stage: arm
rules:
- *ignore_scheduled_pipelines
- changes:
@ -148,7 +148,7 @@
- when: never
.lima-rules:
stage: lima
stage: arm
rules:
- *ignore_scheduled_pipelines
- changes: