KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CI: Collapse radv & radeonsi stages into one 

This is now called 'amd'.

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 d5bf4c99f6
commit 343705a9cf
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitlab-ci.yml
View File

@ -28,10 +28,9 @@ stages:
- software-renderer
- freedreno
- panfrost
- radv
- lima
- virgl
- radeonsi
- amd
- d3d12
- success
@ -1386,7 +1385,7 @@ arm64_a530_gles31:
# RADV CI
.test-radv:
extends: .radv-rules
stage: radv
stage: amd
variables:
VK_DRIVER: radeon
ACO_DEBUG: validateir,validatera

2
.gitlab-ci/test-source-dep.yml
View File

@ -196,7 +196,7 @@
- when: never
.radeonsi-rules:
stage: radeonsi
stage: amd
rules:
- *ignore_scheduled_pipelines
- changes: