Merge branch 'bugfix/cmake_unit_test_fail' into 'master'
Use flasher_args.json for flashing CMake CI unit test See merge request idf/esp-idf!4225
This commit is contained in:
commit
1867da48af
|
@ -272,7 +272,7 @@ build_esp_idf_tests_cmake:
|
|||
- build_examples_cmake/*/*/*/sdkconfig
|
||||
- build_examples_cmake/*/*/*/build/*.elf
|
||||
- build_examples_cmake/*/*/*/build/*.map
|
||||
- build_examples_cmake/*/*/*/build/download.config
|
||||
- build_examples_cmake/*/*/*/build/flasher_args.json
|
||||
- build_examples_cmake/*/*/*/build/bootloader/*.bin
|
||||
- $LOG_PATH
|
||||
expire_in: 2 days
|
||||
|
|
|
@ -144,7 +144,6 @@ build_example () {
|
|||
rm -rf build &&
|
||||
./build.sh >>${BUILDLOG} 2>&1
|
||||
fi &&
|
||||
cp build/flash_project_args build/download.config || # backwards compatible download.config filename
|
||||
{
|
||||
RESULT=$?; FAILED_EXAMPLES+=" ${EXAMPLE_NAME}" ;
|
||||
}
|
||||
|
|
|
@ -215,7 +215,7 @@ def add_action_extensions(base_functions, base_actions):
|
|||
pass
|
||||
shutil.copyfile(partition_table, os.path.join(dest, "partition_table", os.path.basename(partition_table)))
|
||||
|
||||
shutil.copyfile(os.path.join(src, "flash_project_args"), os.path.join(dest, "flash_project_args"))
|
||||
shutil.copyfile(os.path.join(src, "flasher_args.json"), os.path.join(dest, "flasher_args.json"))
|
||||
|
||||
binaries = glob.glob(os.path.join(src, "*.bin"))
|
||||
binaries = [os.path.basename(s) for s in binaries]
|
||||
|
|
Loading…
Reference in a new issue