Module: Mesa
Branch: master
Commit: 343705a9cfa11c4bcdf5fad167c03e5328e1a277
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=343705a9cfa11c4bcdf5fad167c03e5328e1a277

Author: Daniel Stone <[email protected]>
Date:   Wed Dec  2 13:50:38 2020 +0000

CI: Collapse radv & radeonsi stages into one

This is now called 'amd'.

Signed-off-by: Daniel Stone <[email protected]>
Reviewed-by: Erik Faye-Lund <[email protected]>
Acked-by: Eric Anholt <[email protected]>
Acked-by: Michel Dänzer <[email protected]>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7873>

---

 .gitlab-ci.yml                 | 5 ++---
 .gitlab-ci/test-source-dep.yml | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e308cd128bb..4d3cef1105f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 580bfe5dd8e..967627ee049 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -196,7 +196,7 @@
     - when: never
 
 .radeonsi-rules:
-  stage: radeonsi
+  stage: amd
   rules:
     - *ignore_scheduled_pipelines
     - changes:

_______________________________________________
mesa-commit mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to