Merge branch 'bugfix/ci_fixes_v4.1' into 'release/v4.1'

ci: multiple minor fixes (backport v4.1)

See merge request espressif/esp-idf!8226
This commit is contained in:
Angus Gratton 2020-07-06 07:23:46 +08:00
commit 6db66c96d6
4 changed files with 13 additions and 3 deletions

View file

@ -120,8 +120,17 @@ before_script:
dependencies: []
before_script:
- *apply_bot_filter
- $IDF_PATH/tools/idf_tools.py install-python-env
# On macOS, these tools need to be installed
- $IDF_PATH/tools/idf_tools.py --non-interactive install cmake ninja
# This adds tools (compilers) and the version-specific Python environment to PATH
- *setup_tools_unless_target_test
# Install packages required by CI scripts into IDF Python environment
- pip install -r $IDF_PATH/tools/ci/python_packages/ttfw_idf/requirements.txt
- source tools/ci/configure_ci_environment.sh
# Part of tools/ci/setup_python.sh; we don't use pyenv on macOS, so can't run the rest of the script.
- export PYTHONPATH="$IDF_PATH/tools:$IDF_PATH/tools/ci/python_packages:$PYTHONPATH"
- *fetch_submodules
include:
- '/tools/ci/config/pre_check.yml'

View file

@ -178,6 +178,7 @@ void esp_efuse_utility_update_virt_blocks(void)
}
// Prints efuse values for all registers.
#ifndef BOOTLOADER_BUILD
void esp_efuse_utility_debug_dump_blocks(void)
{
printf("EFUSE_BLKx:\n");
@ -201,6 +202,7 @@ void esp_efuse_utility_debug_dump_blocks(void)
#endif
printf("\n");
}
#endif // BOOTLOADER_BUILD
// returns the number of array elements for placing these bits in an array with the length of each element equal to size_of_base.
int esp_efuse_utility_get_number_of_items(int bits, int size_of_base)

View file

@ -60,7 +60,6 @@ BUILD_PATH=$(${REALPATH} --relative-to ${IDF_PATH} ${BUILD_PATH})
ALL_BUILD_LIST_JSON="${BUILD_PATH}/list.json"
JOB_BUILD_LIST_JSON="${BUILD_PATH}/list_job_${CI_NODE_INDEX}.json"
mkdir -p "${BUILD_PATH}/example_builds"
echo "build_examples running for target $IDF_TARGET"
@ -80,7 +79,7 @@ ${IDF_PATH}/tools/find_apps.py examples \
--exclude examples/build_system/idf_as_lib \
--work-dir "${BUILD_PATH}/@f/@w/@t" \
--build-dir build \
--build-log "${LOG_PATH}/@f.txt" \
--build-log "${LOG_PATH}/@f_@w.txt" \
--output ${ALL_BUILD_LIST_JSON} \
--config 'sdkconfig.ci=default' \
--config 'sdkconfig.ci.*=' \

View file

@ -53,7 +53,7 @@ class CMakeBuildSystem(BuildSystem):
# Note: the build system supports taking multiple sdkconfig.defaults files via SDKCONFIG_DEFAULTS
# CMake variable. However here we do this manually to perform environment variable expansion in the
# sdkconfig files.
sdkconfig_defaults_list = ["sdkconfig.defaults"]
sdkconfig_defaults_list = ["sdkconfig.defaults", "sdkconfig.defaults." + build_item.target]
if build_item.sdkconfig_path:
sdkconfig_defaults_list.append(build_item.sdkconfig_path)