MickSlash
/
goldberg_emulator
mirror of https://gitlab.com/Mr_Goldberg/goldberg_emulator.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Use windows line endings for txt files in latest git build.

merge-requests/6/head
Mr_Goldberg 2019-05-17 14:55:14 -04:00
parent 1717323cd7
commit 2b1368ccac
No known key found for this signature in database
GPG Key ID: 8597D87419DEF278
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -59,7 +59,9 @@ build_windows:
image: fedora image: fedora
script: 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\\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/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 - sed -i 's/..\\vcpkg\\packages\\/.\\/g' build_set_protobuf_directories.bat