From 94994f7ad3280da1746f6a3fd7be2431bea82387 Mon Sep 17 00:00:00 2001 From: Marek Fiala Date: Tue, 27 May 2025 10:44:58 +0200 Subject: [PATCH 1/2] fix(test): Temporarily disable test_cli_installer_win --- .gitlab/ci/test-win.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitlab/ci/test-win.yml b/.gitlab/ci/test-win.yml index 1dd0add4c8..02177c4405 100644 --- a/.gitlab/ci/test-win.yml +++ b/.gitlab/ci/test-win.yml @@ -18,6 +18,8 @@ after_script: [] test_cli_installer_win: + rules: + - when: never extends: - .host_test_win_template - .rules:labels:windows_pytest_build_system From c17baef38d8a6b9009caa62d67ab01a9fb82ded4 Mon Sep 17 00:00:00 2001 From: Marek Fiala Date: Tue, 27 May 2025 11:24:58 +0200 Subject: [PATCH 2/2] feat(test): Lower the scope when win tests are automatically executed Introduced new rule "atterns-build_system_win", that coveres scope for windows test. It currently contains only "tools/test_build_system/**/*". --- .gitlab/ci/dependencies/dependencies.yml | 2 +- .gitlab/ci/rules.yml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitlab/ci/dependencies/dependencies.yml b/.gitlab/ci/dependencies/dependencies.yml index 1bc47df4f5..683d8845e7 100644 --- a/.gitlab/ci/dependencies/dependencies.yml +++ b/.gitlab/ci/dependencies/dependencies.yml @@ -91,4 +91,4 @@ specific_rules: - if-schedule-test-build-system-windows patterns: - - build_system + - build_system_win diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml index 64c1d1c859..4a4db3746b 100644 --- a/.gitlab/ci/rules.yml +++ b/.gitlab/ci/rules.yml @@ -56,6 +56,9 @@ - "tools/ci/ci_build_apps.py" - "tools/test_build_system/**/*" +.patterns-build_system_win: &patterns-build_system_win + - "tools/test_build_system/**/*" + .patterns-build_macos: &patterns-build_macos - "tools/ci/test_configure_ci_environment.sh" @@ -392,7 +395,7 @@ - <<: *if-schedule-test-build-system-windows - <<: *if-label-windows - <<: *if-dev-push - changes: *patterns-build_system + changes: *patterns-build_system_win .rules:test:host_test: rules: