Mesa (master): CI: Collapse lima & panfrost stages into one

[GitLab Mirror]

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

Author: Daniel Stone <daniels at collabora.com>
Date:   Wed Dec  2 13:50:38 2020 +0000

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 at collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund at collabora.com>
Acked-by: Eric Anholt <eric at anholt.net>
Acked-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7873>

---

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 78ba118f553..49d75428de6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -26,10 +26,9 @@ stages:
   - meson-x86_64
   - build-misc
   - software-renderer
-  - freedreno
-  - panfrost
-  - lima
   - amd
+  - arm
+  - freedreno
   - layered-backends
   - success
 
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 78c01f07162..fe8e52ef77f 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -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: