espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
CI: make master pipeline compatible with idf-build-apps 1.0.0 release (v5.0)

See merge request espressif/esp-idf!26248
This commit is contained in:
Fu Hanxi
2023-10-02 21:02:08 +08:00
parent 3f55377ab4 5e2c3e23ae
commit 5dba99409e
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/ci/build_template_app.sh
View File

@ -62,7 +62,7 @@ build_stage2() {
--build-log ${BUILD_LOG_CMAKE} \ --build-log ${BUILD_LOG_CMAKE} \
--size-file size.json \ --size-file size.json \
--collect-size-info size_info.txt \ --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 # add esp32h2 back after IDF-5541
} }
@ -77,7 +77,7 @@ build_stage1() {
--build-log ${BUILD_LOG_CMAKE} \ --build-log ${BUILD_LOG_CMAKE} \
--size-file size.json \ --size-file size.json \
--collect-size-info size_info.txt \ --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 # Default arguments

6
tools/ci/ci_build_apps.py
View File

@ -169,7 +169,7 @@ if __name__ == '__main__':
parser.add_argument( parser.add_argument(
'--config', '--config',
default=['sdkconfig.ci=default', 'sdkconfig.ci.*=', '=default'], default=['sdkconfig.ci=default', 'sdkconfig.ci.*=', '=default'],
action='append', nargs='+',
help='Adds configurations (sdkconfig file names) to build. This can either be ' help='Adds configurations (sdkconfig file names) to build. This can either be '
'FILENAME[=NAME] or FILEPATTERN. FILENAME is the name of the sdkconfig file, ' '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, ' 'relative to the project directory, to be used. Optional NAME can be specified, '
@ -204,17 +204,15 @@ if __name__ == '__main__':
) )
parser.add_argument( parser.add_argument(
'--collect-size-info', '--collect-size-info',
type=argparse.FileType('w'),
help='If specified, the test case name and size info json will be written to this file', help='If specified, the test case name and size info json will be written to this file',
) )
parser.add_argument( parser.add_argument(
'--collect-app-info', '--collect-app-info',
type=argparse.FileType('w'),
help='If specified, the test case name and app info json will be written to this file', help='If specified, the test case name and app info json will be written to this file',
) )
parser.add_argument( parser.add_argument(
'--ignore-warning-str', '--ignore-warning-str',
action='append', nargs='+',
help='Ignore the warning string that match the specified regex in the build output. ' help='Ignore the warning string that match the specified regex in the build output. '
'Can be specified multiple times.', 'Can be specified multiple times.',
) )