KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Emma Anholt 2022-06-28 12:44:50 -07:00 committed by Marge Bot
parent 1ffb15ae72
commit f8e62280eb
1 changed files with 15 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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