Jelajahi Sumber

Merge branch 'test/idf-build-apps-1.0.0' into 'master'

CI: make master pipeline compatible with idf-build-apps 1.0.0 release

See merge request espressif/esp-idf!23892
Fu Hanxi 2 tahun lalu
induk
melakukan
d29b3ee584
2 mengubah file dengan 4 tambahan dan 6 penghapusan
  1. 2 2
      tools/ci/build_template_app.sh
  2. 2 4
      tools/ci/ci_build_apps.py

+ 2 - 2
tools/ci/build_template_app.sh

@@ -64,7 +64,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,esp32c6,esp32h2
+        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2
 }
 
 build_stage1() {
@@ -78,7 +78,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,esp32c6,esp32h2
+        --default-build-targets esp32 esp32s2 esp32s3 esp32c2 esp32c3 esp32c6 esp32h2
 }
 
 # Default arguments

+ 2 - 4
tools/ci/ci_build_apps.py

@@ -207,7 +207,7 @@ if __name__ == '__main__':
     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, '
@@ -240,17 +240,15 @@ if __name__ == '__main__':
     )
     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.',
     )