CI: Collapse virgl & d3d12 stages into one

This is now called 'layered-backends'.

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 343705a9cf
commit 5673322745
2 changed files with 3 additions and 4 deletions

View File

@ -29,9 +29,8 @@ stages:
- freedreno - freedreno
- panfrost - panfrost
- lima - lima
- virgl
- amd - amd
- d3d12 - layered-backends
- success - success
# Generic rule to not run the job during scheduled pipelines # Generic rule to not run the job during scheduled pipelines
@ -815,7 +814,7 @@ test-d3d12-windows:
extends: extends:
- .build-windows - .build-windows
- .use-windows_build_vs2019 - .use-windows_build_vs2019
stage: d3d12 stage: layered-backends
dependencies: dependencies:
- meson-windows-vs2019 - meson-windows-vs2019
needs: needs:

View File

@ -177,7 +177,7 @@
- when: never - when: never
.virgl-rules: .virgl-rules:
stage: virgl stage: layered-backends
rules: rules:
- *ignore_scheduled_pipelines - *ignore_scheduled_pipelines
- changes: - changes: