From 2b1368ccacc25f9cfdb5f4d838db563c816fcf7b Mon Sep 17 00:00:00 2001 From: Mr_Goldberg Date: Fri, 17 May 2019 14:55:14 -0400 Subject: [PATCH] Use windows line endings for txt files in latest git build. --- .gitlab-ci.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e9cb660e..2ba09890 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -59,7 +59,9 @@ build_windows: image: fedora script: - - dnf -y install wine wget p7zip sed + - dnf -y install wine wget p7zip sed dos2unix + - unix2dos *.txt + - unix2dos files_example/*.txt files_example/*/*.txt - sed -i 's/C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\amd64\\vcvars64.bat/.\\sdk_standalone\\set_vars64.bat/g' build_env_x64.bat - sed -i 's/C:\\Program Files (x86)\\Microsoft Visual Studio 14.0\\VC\\bin\\vcvars32.bat/.\\sdk_standalone\\set_vars32.bat/g' build_env_x86.bat - sed -i 's/..\\vcpkg\\packages\\/.\\/g' build_set_protobuf_directories.bat