Merge branch 'ci/bypass_esp32h4_error' into 'master'

ci: bypass esp32h4 missing error

See merge request espressif/esp-idf!23331
This commit is contained in:
Fu Hanxi
2023-04-21 15:33:49 +08:00
2 changed files with 8 additions and 2 deletions

View File

@@ -139,7 +139,8 @@ repos:
name: Check if all apps readme files match given .build-test-rules.yml files. Modify the supported target tables name: Check if all apps readme files match given .build-test-rules.yml files. Modify the supported target tables
entry: tools/ci/check_build_test_rules.py check-readmes entry: tools/ci/check_build_test_rules.py check-readmes
language: python language: python
files: 'tools/test_apps/.+|examples/.+|components/.+' files: 'tools/test_apps/.+|examples/.+|components/.+|tools/idf_py_actions/constants.py|tools/ci/check_build_test_rules.py'
require_serial: true
additional_dependencies: additional_dependencies:
- PyYAML == 5.3.1 - PyYAML == 5.3.1
- idf_build_apps - idf_build_apps

View File

@@ -32,6 +32,7 @@ USUAL_TO_FORMAL = {
'esp32c2': 'ESP32-C2', 'esp32c2': 'ESP32-C2',
'esp32c6': 'ESP32-C6', 'esp32c6': 'ESP32-C6',
'esp32h2': 'ESP32-H2', 'esp32h2': 'ESP32-H2',
'esp32h4': 'ESP32-H4',
'linux': 'Linux', 'linux': 'Linux',
} }
@@ -43,6 +44,7 @@ FORMAL_TO_USUAL = {
'ESP32-C2': 'esp32c2', 'ESP32-C2': 'esp32c2',
'ESP32-C6': 'esp32c6', 'ESP32-C6': 'esp32c6',
'ESP32-H2': 'esp32h2', 'ESP32-H2': 'esp32h2',
'ESP32-H4': 'esp32h4',
'Linux': 'linux', 'Linux': 'linux',
} }
@@ -103,7 +105,7 @@ def check_readme(
for part in support_string[0].split('\n', 1)[0].split('|') for part in support_string[0].split('\n', 1)[0].split('|')
if part.strip() if part.strip()
] ]
return support_string[0].strip(), [FORMAL_TO_USUAL[part] for part in parts[1:]] return support_string[0].strip(), [FORMAL_TO_USUAL[part] for part in parts[1:] if part in FORMAL_TO_USUAL]
def check_enable_build(_app: App, _old_supported_targets: List[str]) -> bool: def check_enable_build(_app: App, _old_supported_targets: List[str]) -> bool:
if _app.supported_targets == sorted(_old_supported_targets): if _app.supported_targets == sorted(_old_supported_targets):
@@ -466,6 +468,9 @@ if __name__ == '__main__':
else: else:
check_dirs.add(p) check_dirs.add(p)
if 'tools/idf_py_actions/constants.py' in arg.paths or 'tools/ci/check_build_test_rules.py' in arg.paths:
check_all = True
if check_all: if check_all:
check_dirs = {IDF_PATH} check_dirs = {IDF_PATH}
_exclude_dirs = [os.path.join(IDF_PATH, 'tools', 'unit-test-app'), _exclude_dirs = [os.path.join(IDF_PATH, 'tools', 'unit-test-app'),