Mesa (main): ci: Pull common zink frontend rules to a shared rule list.

[GitLab Mirror]

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

Author: Emma Anholt <emma at anholt.net>
Date:   Tue Jun 28 12:44:50 2022 -0700

ci: Pull common zink frontend rules to a shared rule list.

This drops the mesa/gallium lists from some build rules, since zink common
rules brings them in already.  If we do more driver common rules, we might
end up with those core lists appearing in the yaml multiple times, but
that seems like a small price to pay for not being able to forget some.

Reviewed-by: Guilherme Gallo <guilherme.gallo at collabora.com>
Acked-by: Eric Engestrom <eric at engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17287>

---

 .gitlab-ci/test-source-dep.yml | 65 ++++++++++--------------------------------
 1 file changed, 15 insertions(+), 50 deletions(-)

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 348191e5bc3..7bd17cda949 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -588,8 +588,7 @@
       when: on_success
     - when: never
 
-.zink-rules:
-  stage: layered-backends
+.zink-common-rules:
   rules:
     - !reference [.no_scheduled_pipelines-rules, rules]
     - changes:
@@ -599,50 +598,40 @@
         *gallium_core_file_list
       when: on_success
     - changes:
-        *lavapipe_file_list
-      when: on_success
-    - changes: &zink_file_list
       - src/gallium/drivers/zink/**/*
       when: on_success
-    - when: never
 
-.zink-anv-rules:
+.zink-rules:
   stage: layered-backends
   rules:
     - !reference [.no_scheduled_pipelines-rules, rules]
+    - !reference [.zink-common-rules, rules]
     - changes:
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
+        *lavapipe_file_list
       when: on_success
+    - when: never
+
+.zink-anv-rules:
+  stage: layered-backends
+  rules:
+    - !reference [.no_scheduled_pipelines-rules, rules]
+    - !reference [.zink-common-rules, rules]
     - changes:
         *vulkan_file_list
       when: on_success
     - changes:
       - src/intel/**/*
       when: on_success
-    - changes: &zink_file_list
-      - src/gallium/drivers/zink/**/*
-      when: on_success
     - when: never
 
 .zink-turnip-rules:
   stage: layered-backends
   rules:
     - !reference [.no_scheduled_pipelines-rules, rules]
-    - changes:
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
-      when: on_success
+    - !reference [.zink-common-rules, rules]
     - changes:
         *vulkan_file_list
       when: on_success
-    - changes:
-        *zink_file_list
-      when: on_success
     - changes:
       - src/freedreno/**/*
       when: on_success
@@ -655,12 +644,7 @@
     - if: '$MICROSOFT_FARM == "offline"'
       when: never
     - !reference [.no_scheduled_pipelines-rules, rules]
-    - changes:
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
-      when: on_success
+    - !reference [.zink-common-rules, rules]
     - changes:
         *softpipe_file_list
       when: on_success
@@ -680,9 +664,6 @@
     - changes:
       - src/microsoft/**/*
       when: on_success
-    - changes:
-        *zink_file_list
-      when: on_success
     - changes:
         *radv_file_list
       when: on_success
@@ -763,12 +744,7 @@
 .ppc64el-rules:
    rules:
     - !reference [.no_scheduled_pipelines-rules, rules]
-    - changes:
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
-      when: on_success
+    - !reference [.zink-common-rules, rules]
     - changes:
         *softpipe_file_list
       when: on_success
@@ -784,9 +760,6 @@
     - changes:
         *radeonsi_file_list
       when: on_success
-    - changes:
-        *zink_file_list
-      when: on_success
     - changes:
         *virgl_file_list
       when: on_success
@@ -799,12 +772,7 @@
 .s390x-rules:
    rules:
     - !reference [.no_scheduled_pipelines-rules, rules]
-    - changes:
-        *mesa_core_file_list
-      when: on_success
-    - changes:
-        *gallium_core_file_list
-      when: on_success
+    - !reference [.zink-common-rules, rules]
     - changes:
         *softpipe_file_list
       when: on_success
@@ -814,7 +782,4 @@
     - changes:
         *lavapipe_file_list
       when: on_success
-    - changes:
-        *zink_file_list
-      when: on_success
     - when: never