From: Emma Anholt <emma@anholt.net>
Date: Tue, 28 Jun 2022 19:44:50 +0000 (-0700)
Subject: ci: Pull common zink frontend rules to a shared rule list.
X-Git-Tag: upstream/22.3.5~6718
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f8e62280eb88d967ee54f838545417826d2bd14d;p=platform%2Fupstream%2Fmesa.git

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@collabora.com>
Acked-by: Eric Engestrom <eric@engestrom.ch>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17287>
---

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index 348191e..7bd17cd 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,51 +598,41 @@
         *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
     - when: never
@@ -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
@@ -681,9 +665,6 @@
       - src/microsoft/**/*
       when: on_success
     - changes:
-        *zink_file_list
-      when: on_success
-    - changes:
         *radv_file_list
       when: on_success
     - when: never
@@ -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
@@ -785,9 +761,6 @@
         *radeonsi_file_list
       when: on_success
     - changes:
-        *zink_file_list
-      when: on_success
-    - changes:
         *virgl_file_list
       when: on_success
     - changes:
@@ -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