Merge branch 'test/idf-build-apps-1.0.0_v5.0' into 'release/v5.0'

CI: make master pipeline compatible with idf-build-apps 1.0.0 release (v5.0) See merge request espressif/esp-idf!26248
espressif · Oct 2, 2023 · 5dba994 · 5dba994
2 parents 3f55377 + 5e2c3e2
commit 5dba994
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/tools/ci/build_template_app.sh b/tools/ci/build_template_app.sh
@@ -62,7 +62,7 @@ build_stage2() {
         --build-log ${BUILD_LOG_CMAKE} \
         --size-file size.json \
         --collect-size-info size_info.txt \
-        --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3
+        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3
         # add esp32h2 back after IDF-5541
 }
 
@@ -77,7 +77,7 @@ build_stage1() {
         --build-log ${BUILD_LOG_CMAKE} \
         --size-file size.json \
         --collect-size-info size_info.txt \
-        --default-build-targets esp32,esp32s2,esp32s3,esp32c2,esp32c3,esp32h2
+        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32h2
 }
 
 # Default arguments

diff --git a/tools/ci/ci_build_apps.py b/tools/ci/ci_build_apps.py
@@ -169,7 +169,7 @@ def main(args: argparse.Namespace) -> None:
     parser.add_argument(
         '--config',
         default=['sdkconfig.ci=default', 'sdkconfig.ci.*=', '=default'],
-        action='append',
+        nargs='+',
         help='Adds configurations (sdkconfig file names) to build. This can either be '
         'FILENAME[=NAME] or FILEPATTERN. FILENAME is the name of the sdkconfig file, '
         'relative to the project directory, to be used. Optional NAME can be specified, '
@@ -204,17 +204,15 @@ def main(args: argparse.Namespace) -> None:
     )
     parser.add_argument(
         '--collect-size-info',
-        type=argparse.FileType('w'),
         help='If specified, the test case name and size info json will be written to this file',
     )
     parser.add_argument(
         '--collect-app-info',
-        type=argparse.FileType('w'),
         help='If specified, the test case name and app info json will be written to this file',
     )
     parser.add_argument(
         '--ignore-warning-str',
-        action='append',
+        nargs='+',
         help='Ignore the warning string that match the specified regex in the build output. '
         'Can be specified multiple times.',
     )