Mesa (main): ci/windows: fix zink msvc build-rules

[GitLab Mirror]

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

Author: Erik Faye-Lund <erik.faye-lund at collabora.com>
Date:   Thu Jun 24 22:45:20 2021 +0200

ci/windows: fix zink msvc build-rules

When I added the build-rules for zink to the windows build, I
accidentally added it to .windows-test-rules instead of
.windows-build-rules. This seems to trigger a build-error if we trigger
*just* a test due to a zink-change, but not a build.

Hopefully this fixes the problems Mike has had with Zink CI recently.

Fixes: a426d7c2643 ("ci/windows: enable msvc builds of zink")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11597>

---

 .gitlab-ci/test-source-dep.yml | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index c739838e271..433a1924e63 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -383,6 +383,24 @@
       when: on_success
     - when: never
 
+.zink-rules:
+  stage: layered-backends
+  rules:
+    - *ignore_scheduled_pipelines
+    - changes:
+        *mesa_core_file_list
+      when: on_success
+    - changes:
+        *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
+
 # Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
 # rules duplication manually
 .windows-build-rules:
@@ -408,23 +426,8 @@
       - src/gallium/targets/libgl-gdi/*
       - src/gallium/targets/libgl-d3d12/*
       when: on_success
-    - when: never
-
-.zink-rules:
-  stage: layered-backends
-  rules:
-    - *ignore_scheduled_pipelines
-    - changes:
-        *mesa_core_file_list
-      when: on_success
     - changes:
-        *gallium_core_file_list
-      when: on_success
-    - changes:
-        *lavapipe_file_list
-      when: on_success
-    - changes: &zink_file_list
-      - src/gallium/drivers/zink/**/*
+        *zink_file_list
       when: on_success
     - when: never
 
@@ -445,9 +448,6 @@
       when: on_success
     - changes: *d3d12_file_list
       when: on_success
-    - changes:
-        *zink_file_list
-      when: on_success
     - when: never
 
 # Rules for unusual architectures that only build a subset of drivers