From f20122643939907f66e93b20988080ba40a9f1af Mon Sep 17 00:00:00 2001 From: Song Ruo Jing Date: Mon, 21 Nov 2022 14:53:45 +0800 Subject: [PATCH] ci: Move esp32c6 from preview_targets to supported_targets for ci --- .gitlab/ci/default-build-test-rules.yml | 4 ++-- conftest.py | 4 ++-- pytest.ini | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.gitlab/ci/default-build-test-rules.yml b/.gitlab/ci/default-build-test-rules.yml index 04f16f3667..52a27a6d3b 100644 --- a/.gitlab/ci/default-build-test-rules.yml +++ b/.gitlab/ci/default-build-test-rules.yml @@ -9,8 +9,8 @@ extra_default_build_targets: - esp32c6 -bypass_check_test_targets: - - esp32c6 +# bypass_check_test_targets: +# - esp32c6 # # These lines would # - enable the README.md check for esp32c6. Don't forget to add the build jobs in .gitlab/ci/build.yml diff --git a/conftest.py b/conftest.py index a6a0595ab3..6da957ca7c 100644 --- a/conftest.py +++ b/conftest.py @@ -47,8 +47,8 @@ except ImportError: import common_test_methods # noqa: F401 -SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2'] -PREVIEW_TARGETS = ['esp32h4', 'esp32c6'] # this PREVIEW_TARGETS excludes 'linux' target +SUPPORTED_TARGETS = ['esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2', 'esp32c6'] +PREVIEW_TARGETS = ['esp32h4'] # this PREVIEW_TARGETS excludes 'linux' target DEFAULT_SDKCONFIG = 'default' diff --git a/pytest.ini b/pytest.ini index 2b08159450..9e1616089d 100644 --- a/pytest.ini +++ b/pytest.ini @@ -27,8 +27,8 @@ markers = esp32c2: support esp32c2 target esp32c6: support esp32c6 target esp32h4: support esp32h4 target - supported_targets: support all supported targets ('esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2') - preview_targets: support all preview targets ('linux', 'esp32h4', 'esp32c6') + supported_targets: support all supported targets ('esp32', 'esp32s2', 'esp32c3', 'esp32s3', 'esp32c2', 'esp32c6') + preview_targets: support all preview targets ('linux', 'esp32h4') all_targets: support all targets, including supported ones and preview ones temp_skip_ci: temp skip ci for specified targets, can only work with `supported_targets`, `preview_targets`, `all_targets`