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

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

CI: Collapse llvmpipe & softpipe stages into one

This is now called 'software-renderer'.

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                 | 3 +--
 .gitlab-ci/test-source-dep.yml | 6 +++---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46cb183b76b..e308cd128bb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,8 +25,7 @@ stages:
   - deploy
   - meson-x86_64
   - build-misc
-  - llvmpipe
-  - softpipe
+  - software-renderer
   - freedreno
   - panfrost
   - radv
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 71f546951d3..580bfe5dd8e 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -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:

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

Reply via email to