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

ci/zink: Simplify lavapipe rules setup, and clarify what the rules are for.

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 13:45:16 -07:00
committed by Marge Bot
parent a27b95d113
commit ea886f23d1
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -485,15 +485,11 @@
- src/gallium/drivers/zink/**/* - src/gallium/drivers/zink/**/*
when: on_success when: on_success
.zink-rules: .zink-lvp-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 [.lavapipe-rules, rules]
*lavapipe_file_list
when: on_success
- when: never
.zink-anv-rules: .zink-anv-rules:
stage: layered-backends stage: layered-backends

2
src/gallium/drivers/zink/ci/gitlab-ci.yml
View File

@@ -1,6 +1,6 @@
.zink-lvp-test: .zink-lvp-test:
extends: extends:
- .zink-rules - .zink-lvp-rules
variables: variables:
MESA_LOADER_DRIVER_OVERRIDE: "zink" MESA_LOADER_DRIVER_OVERRIDE: "zink"
LIBGL_ALWAYS_SOFTWARE: "true" LIBGL_ALWAYS_SOFTWARE: "true"