From 84c8a35aa2ca4d4de66192933735094ed07b4aaa Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Fri, 11 Dec 2020 10:41:32 +0000 Subject: [PATCH] CI: Add Windows source dependency map Now that we've soaked the Windows build in and it's working well, restrict it to only running on given pipelines, albeit in a somewhat surprising way. Signed-off-by: Daniel Stone Part-of: --- .gitlab-ci.yml | 2 ++ .gitlab-ci/test-source-dep.yml | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d2072a259f1..fbff9d20497 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -807,6 +807,7 @@ meson-windows-vs2019: extends: - .build-windows - .use-windows_build_vs2019 + - .windows-build-rules stage: build-misc script: - . .\.gitlab-ci\windows\mesa_build.ps1 @@ -818,6 +819,7 @@ test-d3d12-windows: extends: - .build-windows - .use-windows_build_vs2019 + - .windows-test-rules stage: layered-backends dependencies: - meson-windows-vs2019 diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 80af75a305c..1d418f2165e 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -233,3 +233,36 @@ - src/amd/registers/**/* when: on_success - when: never + +# Unfortunately YAML doesn't let us concatenate arrays, so we have to do the +# rules duplication manually +.windows-build-rules: + rules: + - changes: + *mesa_core_file_list + when: on_success + - changes: + *gallium_core_file_list + when: on_success + - changes: &d3d12_file_list + - src/gallium/drivers/d3d12/**/* + - src/microsoft/**/* + - src/gallium/frontends/wgl/* + - src/gallium/winsys/d3d12/wgl/* + - src/gallium/targets/libgl-gdi/* + - src/gallium/targets/libgl-d3d12/* + when: on_success + - when: never + +.windows-test-rules: + rules: + - *ignore_scheduled_pipelines + - changes: + *mesa_core_file_list + when: on_success + - changes: + *gallium_core_file_list + when: on_success + - changes: *d3d12_file_list + when: on_success + - when: never -- 2.34.1