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
espressif · Oct 22, 2023 · c79dc27 · c79dc27
2 parents 0049cc6 + 6a3cf1f
commit c79dc27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitlab/ci/rules.yml b/.gitlab/ci/rules.yml
@@ -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"

diff --git a/tools/idf_py_actions/core_ext.py b/tools/idf_py_actions/core_ext.py
@@ -77,8 +77,8 @@ def menuconfig(target_name: str, ctx: Context, args: PropertyDict, style: str) -
         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