diff --git a/.gitlab-ci/container/gitlab-ci.yml b/.gitlab-ci/container/gitlab-ci.yml index 2330b98e27a..89df8aa797d 100644 --- a/.gitlab-ci/container/gitlab-ci.yml +++ b/.gitlab-ci/container/gitlab-ci.yml @@ -437,8 +437,7 @@ debian/arm64_test: - .container - .windows-docker-vs2019 rules: - - if: '$MICROSOFT_FARM == "offline"' - when: never + - !reference [.microsoft-farm-rules, rules] - !reference [.container-rules, rules] variables: GIT_STRATEGY: fetch # we do actually need the full repository though @@ -468,8 +467,7 @@ windows_build_vs2019: extends: - .windows_container_build rules: - - if: '$MICROSOFT_FARM == "offline"' - when: never + - !reference [.microsoft-farm-rules, rules] - !reference [.build-rules, rules] variables: MESA_IMAGE_PATH: &windows_build_image_path ${WINDOWS_X64_BUILD_PATH} @@ -488,8 +486,7 @@ windows_test_vs2019: extends: - .windows_container_build rules: - - if: '$MICROSOFT_FARM == "offline"' - when: never + - !reference [.microsoft-farm-rules, rules] - !reference [.build-rules, rules] variables: MESA_IMAGE_PATH: &windows_test_image_path ${WINDOWS_X64_TEST_PATH} diff --git a/.gitlab-ci/test-source-dep.yml b/.gitlab-ci/test-source-dep.yml index 1d2ba1d0c9d..a28658bcddf 100644 --- a/.gitlab-ci/test-source-dep.yml +++ b/.gitlab-ci/test-source-dep.yml @@ -300,6 +300,11 @@ when: never - !reference [.collabora-farm-rules, rules] +.microsoft-farm-rules: + rules: + - if: '$MICROSOFT_FARM == "offline"' + when: never + # Rules for changes that impact either freedreno or turnip. .freedreno-common-rules: rules: @@ -915,8 +920,7 @@ # rules duplication manually .windows-build-rules: rules: - - if: '$MICROSOFT_FARM == "offline"' - when: never + - !reference [.microsoft-farm-rules, rules] - !reference [.zink-common-rules, rules] - !reference [.vulkan-rules, rules] - changes: @@ -943,8 +947,7 @@ .glon12-test-rules: rules: - - if: '$MICROSOFT_FARM == "offline"' - when: never + - !reference [.microsoft-farm-rules, rules] - !reference [.gl-rules, rules] - changes: *d3d12_file_list when: on_success @@ -954,8 +957,7 @@ .spirv2dxil-test-rules: rules: - - if: '$MICROSOFT_FARM == "offline"' - when: never + - !reference [.microsoft-farm-rules, rules] - !reference [.core-rules, rules] - changes: &spirv2dxil_file_list - src/microsoft/ci/* @@ -965,8 +967,7 @@ .dozen-test-rules: rules: - - if: '$MICROSOFT_FARM == "offline"' - when: never + - !reference [.microsoft-farm-rules, rules] - !reference [.vulkan-rules, rules] - changes: *spirv2dxil_file_list