ci: Move 'never' rules includes above "on_success" rules includes.

The farm online-ness filters were listed after some of the checks for
whether code changed, so an offline farm might still be used in that case.

Acked-by: David Heidelberg <david.heidelberg@collabora.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18263>
This commit is contained in:
Emma Anholt
2022-07-09 20:28:42 -07:00
committed by Marge Bot
parent 71ace23fa7
commit 6b338d6cc5

View File

@@ -168,8 +168,8 @@
.freedreno-rules:
stage: freedreno
rules:
- !reference [.gl-rules, rules]
- !reference [.freedreno-common-rules, rules]
- !reference [.gl-rules, rules]
- changes: &freedreno_gl_file_list
- src/freedreno/ir2/**/*
- src/gallium/drivers/freedreno/**/*
@@ -179,8 +179,8 @@
.turnip-rules:
stage: freedreno
rules:
- !reference [.vulkan-rules, rules]
- !reference [.freedreno-common-rules, rules]
- !reference [.vulkan-rules, rules]
- changes:
- src/freedreno/vulkan/**/*
when: on_success
@@ -477,20 +477,20 @@
.zink-lvp-rules:
stage: layered-backends
rules:
- !reference [.zink-common-rules, rules]
- !reference [.lavapipe-rules, rules]
- !reference [.zink-common-rules, rules]
.zink-anv-rules:
stage: layered-backends
rules:
- !reference [.zink-common-rules, rules]
- !reference [.anv-rules, rules]
- !reference [.zink-common-rules, rules]
.zink-turnip-rules:
stage: layered-backends
rules:
- !reference [.zink-common-rules, rules]
- !reference [.turnip-rules, rules]
- !reference [.zink-common-rules, rules]
# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the
# rules duplication manually