From 6bf4b89fcb0e71957eb7266abb8ce2b08d867cf9 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Tue, 27 Jun 2023 12:46:00 -0700 Subject: [PATCH] ci: Clean up .intel-rules definition. The "!reference" syntax means we can just pull the two driver's rulesets together. Part-of: --- .gitlab-ci/test-source-dep.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index ba3ce39..f5e58f8 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -917,16 +917,12 @@ - src/intel/**/* when: on_success +# ruleset to trigger on changes affecting either anv or iris, for jobs using both (piglit, skqp) .intel-rules: stage: intel rules: - - !reference [.collabora-farm-rules, rules] - # Note that we trigger on changes both anv and iris, because piglit and skqp jobs test both. - - !reference [.vulkan-rules, rules] - - !reference [.gl-rules, rules] - - changes: - *iris_file_list - when: on_success + - !reference [.iris-rules, rules] + - !reference [.anv-rules, rules] .virgl-rules: stage: layered-backends -- 2.7.4