OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Simplify vulkan rules using !references.

Browse Source 
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>
This commit is contained in:
Emma Anholt
2022-06-28 11:19:56 -07:00
committed by Marge Bot
parent 6587477292
commit 02269059d1
1 changed files with 10 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
.gitlab-ci/test-source-dep.yml
View File

@@ -56,7 +56,6 @@
- changes: &vulkan_file_list - changes: &vulkan_file_list
- src/vulkan/**/* - src/vulkan/**/*
when: on_success when: on_success
- when: never
# Gallium core source file dependencies # Gallium core source file dependencies
# ------------------------------------- # -------------------------------------
@@ -109,7 +108,7 @@
.lavapipe-rules: .lavapipe-rules:
stage: software-renderer stage: software-renderer
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.vulkan-rules, rules]
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@@ -121,9 +120,6 @@
- src/gallium/frontends/lavapipe/**/* - src/gallium/frontends/lavapipe/**/*
- src/gallium/winsys/sw/**/* - src/gallium/winsys/sw/**/*
when: on_success when: on_success
- changes:
*vulkan_file_list
when: on_success
- when: never - when: never
.llvmpipe-cl-rules: .llvmpipe-cl-rules:
@@ -167,16 +163,13 @@
stage: freedreno stage: freedreno
rules: rules:
- !reference [.freedreno-farm-rules, rules] - !reference [.freedreno-farm-rules, rules]
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.vulkan-rules, rules]
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
- changes: - changes:
*gallium_core_file_list *gallium_core_file_list
when: on_success when: on_success
- changes:
*vulkan_file_list
when: on_success
- changes: &freedreno_file_list - changes: &freedreno_file_list
# Note: when https://gitlab.com/gitlab-org/gitlab/-/issues/198688 # Note: when https://gitlab.com/gitlab-org/gitlab/-/issues/198688
# is supported, we can change the src/freedreno/ rule to explicitly # is supported, we can change the src/freedreno/ rule to explicitly
@@ -269,8 +262,8 @@
.panfrost-bifrost-rules: .panfrost-bifrost-rules:
stage: arm stage: arm
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.collabora-farm-rules, rules] - !reference [.collabora-farm-rules, rules]
- !reference [.vulkan-rules, rules]
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@@ -283,9 +276,6 @@
- changes: - changes:
*panfrost_gallium_file_list *panfrost_gallium_file_list
when: on_success when: on_success
- changes:
*vulkan_file_list
when: on_success
- changes: &panfrost_vulkan_file_list - changes: &panfrost_vulkan_file_list
- src/panfrost/vulkan/* - src/panfrost/vulkan/*
when: on_success when: on_success
@@ -333,13 +323,10 @@
.v3dv-rules: .v3dv-rules:
stage: broadcom stage: broadcom
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.vulkan-rules, rules]
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
- changes:
*vulkan_file_list
when: on_success
- changes: - changes:
- src/broadcom/**/* - src/broadcom/**/*
when: on_success when: on_success
@@ -541,12 +528,7 @@
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.collabora-farm-rules, rules] - !reference [.collabora-farm-rules, rules]
- changes: - !reference [.vulkan-rules, rules]
*mesa_core_file_list
when: on_success
- changes:
*vulkan_file_list
when: on_success
- changes: - changes:
- src/intel/**/* - src/intel/**/*
when: on_success when: on_success
@@ -555,8 +537,8 @@
.intel-rules: .intel-rules:
stage: intel stage: intel
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.collabora-farm-rules, rules] - !reference [.collabora-farm-rules, rules]
- !reference [.vulkan-rules, rules]
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
@@ -568,9 +550,6 @@
- src/gallium/winsys/iris/**/* - src/gallium/winsys/iris/**/*
- src/intel/**/* - src/intel/**/*
when: on_success when: on_success
- changes:
*vulkan_file_list
when: on_success
- when: never - when: never
.zink-common-rules: .zink-common-rules:
@@ -599,11 +578,8 @@
.zink-anv-rules: .zink-anv-rules:
stage: layered-backends stage: layered-backends
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.zink-common-rules, rules] - !reference [.zink-common-rules, rules]
- changes: - !reference [.vulkan-rules, rules]
*vulkan_file_list
when: on_success
- changes: - changes:
- src/intel/**/* - src/intel/**/*
when: on_success when: on_success
@@ -612,11 +588,8 @@
.zink-turnip-rules: .zink-turnip-rules:
stage: layered-backends stage: layered-backends
rules: rules:
- !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.zink-common-rules, rules] - !reference [.zink-common-rules, rules]
- changes: - !reference [.vulkan-rules, rules]
*vulkan_file_list
when: on_success
- changes: - changes:
- src/freedreno/**/* - src/freedreno/**/*
when: on_success when: on_success
@@ -628,17 +601,14 @@
rules: rules:
- if: '$MICROSOFT_FARM == "offline"' - if: '$MICROSOFT_FARM == "offline"'
when: never when: never
- !reference [.no_scheduled_pipelines-rules, rules]
- !reference [.zink-common-rules, rules] - !reference [.zink-common-rules, rules]
- !reference [.vulkan-rules, rules]
- changes: - changes:
*softpipe_file_list *softpipe_file_list
when: on_success when: on_success
- changes: - changes:
*lavapipe_file_list *lavapipe_file_list
when: on_success when: on_success
- changes:
*vulkan_file_list
when: on_success
- changes: &d3d12_file_list - changes: &d3d12_file_list
- src/gallium/drivers/d3d12/**/* - src/gallium/drivers/d3d12/**/*
- src/gallium/frontends/wgl/* - src/gallium/frontends/wgl/*
@@ -690,13 +660,10 @@
rules: rules:
- if: '$MICROSOFT_FARM == "offline"' - if: '$MICROSOFT_FARM == "offline"'
when: never when: never
- !reference [.no_scheduled_pipelines-rules, rules] - !reference [.vulkan-rules, rules]
- changes: - changes:
*mesa_core_file_list *mesa_core_file_list
when: on_success when: on_success
- changes:
*vulkan_file_list
when: on_success
- changes: - changes:
*spirv2dxil_file_list *spirv2dxil_file_list
when: on_success when: on_success