Merge branch 'bugfix/save_defconfig_add_menu' into 'master'

fix(idf.py): fixed save-defconfig failing due to wrong argument name

See merge request espressif/esp-idf!26617
pull/12486/head
Marius Vikhammer 2023-10-22 23:32:10 +08:00
commit c79dc27961
2 zmienionych plików z 4 dodań i 2 usunięć

Wyświetl plik

@ -58,6 +58,8 @@
.patterns-build_system: &patterns-build_system
- "tools/cmake/**/*"
- "tools/kconfig_new/**/*"
- "tools/idf.py"
- "tools/idf_py_actions/**/*"
- "tools/requirements.json"
- "tools/ci/test_build_system*.sh"
- "tools/ci/test_build_system*.py"

Wyświetl plik

@ -77,8 +77,8 @@ def action_extensions(base_actions: Dict, project_path: str) -> Any:
args.no_hints = True
build_target(target_name, ctx, args)
def save_defconfig(target_name: str, ctx: Context, args: PropertyDict, menu_labels: bool) -> None:
if menu_labels:
def save_defconfig(target_name: str, ctx: Context, args: PropertyDict, add_menu_labels: bool) -> None:
if add_menu_labels:
os.environ['ESP_IDF_KCONFIG_MIN_LABELS'] = '1'
else:
# unset variable