From 6b338d6cc5b0ef50327846d5d88c0a21266c6303 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Sat, 9 Jul 2022 20:28:42 -0700 Subject: [PATCH] ci: Move 'never' rules includes above "on_success" rules includes. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Michel Dänzer Part-of: --- .gitlab-ci/test-source-dep.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 58f282fe527..aacc5591ef2 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -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