Merge branch 'bugfix/ci_config_merge_newlines' into 'master'

ci: Support joining sdkconfig.ci files that don't end in a newline See merge request espressif/esp-idf!8198
marcospanghero · Apr 1, 2020 · 1ab285b · 1ab285b
2 parents 2f0a57d + ff427c9
commit 1ab285b
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/tools/find_build_apps/cmake.py b/tools/find_build_apps/cmake.py
@@ -73,6 +73,8 @@ def build(build_item):  # type: (BuildItem) -> None
                     logging.debug("Appending {} to sdkconfig".format(sdkconfig_name))
                     with open(sdkconfig_path, "r") as f_in:
                         for line in f_in:
+                            if not line.endswith("\n"):
+                                line += "\n"
                             f_out.write(os.path.expandvars(line))
             # Also save the sdkconfig file in the build directory
             shutil.copyfile(