mirror of
https://github.com/espressif/esp-idf.git
synced 2024-10-05 20:47:46 -04:00
Merge branch 'bugfix/ci_unterminated_sdkconfig_defaults_v3.3' into 'release/v3.3'
CI: Add EOL to sdkconfig.defaults before adding sdkconfig.ci (v3.3) See merge request espressif/esp-idf!8458
This commit is contained in:
commit
b2fb688eaf
@ -125,6 +125,9 @@ build_example () {
|
||||
# If sdkconfig.ci file is present, append it to sdkconfig.defaults,
|
||||
# replacing environment variables
|
||||
if [[ -f "$SDKCONFIG_DEFAULTS_CI" ]]; then
|
||||
# Make sure that the last line of sdkconfig.defaults is terminated. Otherwise, the first line
|
||||
# of $SDKCONFIG_DEFAULTS_CI will be joined with the last one of sdkconfig.defaults.
|
||||
echo >> sdkconfig.defaults
|
||||
cat $SDKCONFIG_DEFAULTS_CI | $IDF_PATH/tools/ci/envsubst.py >> sdkconfig.defaults
|
||||
fi
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user