Skip to content

Commit 00038bd

Browse files
committed
Merge branch 'fix/temp_disable_win_cli_installer' into 'master'
fix(test): Temporarily disable test_cli_installer_win See merge request espressif/esp-idf!39458
2 parents bb9fbc0 + c17baef commit 00038bd

File tree

3 files changed

+7
-2
lines changed

3 files changed

+7
-2
lines changed

.gitlab/ci/dependencies/dependencies.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,4 +91,4 @@
9191
specific_rules:
9292
- if-schedule-test-build-system-windows
9393
patterns:
94-
- build_system
94+
- build_system_win

.gitlab/ci/rules.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@
5656
- "tools/ci/ci_build_apps.py"
5757
- "tools/test_build_system/**/*"
5858

59+
.patterns-build_system_win: &patterns-build_system_win
60+
- "tools/test_build_system/**/*"
61+
5962
.patterns-build_macos: &patterns-build_macos
6063
- "tools/ci/test_configure_ci_environment.sh"
6164

@@ -392,7 +395,7 @@
392395
- <<: *if-schedule-test-build-system-windows
393396
- <<: *if-label-windows
394397
- <<: *if-dev-push
395-
changes: *patterns-build_system
398+
changes: *patterns-build_system_win
396399

397400
.rules:test:host_test:
398401
rules:

.gitlab/ci/test-win.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@
1818
after_script: []
1919

2020
test_cli_installer_win:
21+
rules:
22+
- when: never
2123
extends:
2224
- .host_test_win_template
2325
- .rules:labels:windows_pytest_build_system

0 commit comments

Comments
 (0)