소스 검색

Merge branch 'bugfix/ci_unterminated_sdkconfig_defaults' into 'master'

CI: Add EOL to sdkconfig.defaults before adding sdkconfig.ci

See merge request espressif/esp-idf!8437
Ivan Grokhotkov 5 년 전
부모
커밋
8a007dcbc2
1개의 변경된 파일3개의 추가작업 그리고 0개의 파일을 삭제
  1. 3 0
      tools/ci/build_examples.sh

+ 3 - 0
tools/ci/build_examples.sh

@@ -128,6 +128,9 @@ build_example () {
         # If sdkconfig.ci file is present, append it to sdkconfig.defaults,
         # If sdkconfig.ci file is present, append it to sdkconfig.defaults,
         # replacing environment variables
         # replacing environment variables
         if [[ -f "$SDKCONFIG_DEFAULTS_CI" ]]; then
         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
             cat $SDKCONFIG_DEFAULTS_CI | $IDF_PATH/tools/ci/envsubst.py >> sdkconfig.defaults
         fi
         fi