Mesa (main): ci: Simplify vulkan rules using !references.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Thu Jun 30 19:10:34 UTC 2022
Module: Mesa
Branch: main
Commit: 02269059d1c821259503f08161384dafaa8930ba
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=02269059d1c821259503f08161384dafaa8930ba
Author: Emma Anholt <emma at anholt.net>
Date: Tue Jun 28 11:19:56 2022 -0700
ci: Simplify vulkan rules using !references.
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 | 53 ++++++++----------------------------------
1 file changed, 10 insertions(+), 43 deletions(-)
diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml
index af33e707e43..7a3983e2473 100644
--- a/.gitlab-ci/test-source-dep.yml
+++ b/.gitlab-ci/test-source-dep.yml
@@ -56,7 +56,6 @@
- changes: &vulkan_file_list
- src/vulkan/**/*
when: on_success
- - when: never
# Gallium core source file dependencies
# -------------------------------------
@@ -109,7 +108,7 @@
.lavapipe-rules:
stage: software-renderer
rules:
- - !reference [.no_scheduled_pipelines-rules, rules]
+ - !reference [.vulkan-rules, rules]
- changes:
*mesa_core_file_list
when: on_success
@@ -121,9 +120,6 @@
- src/gallium/frontends/lavapipe/**/*
- src/gallium/winsys/sw/**/*
when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
- when: never
.llvmpipe-cl-rules:
@@ -167,16 +163,13 @@
stage: freedreno
rules:
- !reference [.freedreno-farm-rules, rules]
- - !reference [.no_scheduled_pipelines-rules, rules]
+ - !reference [.vulkan-rules, rules]
- changes:
*mesa_core_file_list
when: on_success
- changes:
*gallium_core_file_list
when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
- changes: &freedreno_file_list
# Note: when https://gitlab.com/gitlab-org/gitlab/-/issues/198688
# is supported, we can change the src/freedreno/ rule to explicitly
@@ -269,8 +262,8 @@
.panfrost-bifrost-rules:
stage: arm
rules:
- - !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.collabora-farm-rules, rules]
+ - !reference [.vulkan-rules, rules]
- changes:
*mesa_core_file_list
when: on_success
@@ -283,9 +276,6 @@
- changes:
*panfrost_gallium_file_list
when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
- changes: &panfrost_vulkan_file_list
- src/panfrost/vulkan/*
when: on_success
@@ -333,13 +323,10 @@
.v3dv-rules:
stage: broadcom
rules:
- - !reference [.no_scheduled_pipelines-rules, rules]
+ - !reference [.vulkan-rules, rules]
- changes:
*mesa_core_file_list
when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
- changes:
- src/broadcom/**/*
when: on_success
@@ -541,12 +528,7 @@
rules:
- !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.collabora-farm-rules, rules]
- - changes:
- *mesa_core_file_list
- when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
+ - !reference [.vulkan-rules, rules]
- changes:
- src/intel/**/*
when: on_success
@@ -555,8 +537,8 @@
.intel-rules:
stage: intel
rules:
- - !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.collabora-farm-rules, rules]
+ - !reference [.vulkan-rules, rules]
- changes:
*mesa_core_file_list
when: on_success
@@ -568,9 +550,6 @@
- src/gallium/winsys/iris/**/*
- src/intel/**/*
when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
- when: never
.zink-common-rules:
@@ -599,11 +578,8 @@
.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
+ - !reference [.vulkan-rules, rules]
- changes:
- src/intel/**/*
when: on_success
@@ -612,11 +588,8 @@
.zink-turnip-rules:
stage: layered-backends
rules:
- - !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.zink-common-rules, rules]
- - changes:
- *vulkan_file_list
- when: on_success
+ - !reference [.vulkan-rules, rules]
- changes:
- src/freedreno/**/*
when: on_success
@@ -628,17 +601,14 @@
rules:
- if: '$MICROSOFT_FARM == "offline"'
when: never
- - !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.zink-common-rules, rules]
+ - !reference [.vulkan-rules, rules]
- changes:
*softpipe_file_list
when: on_success
- changes:
*lavapipe_file_list
when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
- changes: &d3d12_file_list
- src/gallium/drivers/d3d12/**/*
- src/gallium/frontends/wgl/*
@@ -690,13 +660,10 @@
rules:
- if: '$MICROSOFT_FARM == "offline"'
when: never
- - !reference [.no_scheduled_pipelines-rules, rules]
+ - !reference [.vulkan-rules, rules]
- changes:
*mesa_core_file_list
when: on_success
- - changes:
- *vulkan_file_list
- when: on_success
- changes:
*spirv2dxil_file_list
when: on_success
More information about the mesa-commit
mailing list