Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'bugfix/ci_unterminated_sdkconfig_defaults_v4.0' into 'release/v4.0'

Browse source 
CI: Add EOL to sdkconfig.defaults before adding sdkconfig.ci (v4.0)

See merge request espressif/esp-idf!8457
This commit is contained in:
Angus Gratton 2020-05-27 07:48:43 +08:00
parent 798cc4deb7 c4af9d3e24
commit 1d7765eeea
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tools/ci/build_examples.sh
View file

@ -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