Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'xMAC94x/fix_windows_build' into 'master'

Browse Source 
the file version changed with the baseimage update to 22.04

See merge request veloren/veloren!4523
This commit is contained in:
Marcel 2024-07-10 22:07:53 +00:00
commit 9452500f16
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab/CI/build.gitlab-ci.yml
View File

@ -110,8 +110,8 @@ coverage:
- source ./.gitlab/scripts/windows-x86_64.sh - source ./.gitlab/scripts/windows-x86_64.sh
- cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR - cp -r target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
- cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR - cp -r target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
- cp /usr/lib/gcc/x86_64-w64-mingw32/9.3-posix/libgcc_s_seh-1.dll $CI_PROJECT_DIR - cp /usr/lib/gcc/x86_64-w64-mingw32/10-posix/libgcc_s_seh-1.dll $CI_PROJECT_DIR
- cp /usr/lib/gcc/x86_64-w64-mingw32/9.3-posix/libstdc++-6.dll $CI_PROJECT_DIR - cp /usr/lib/gcc/x86_64-w64-mingw32/10-posix/libstdc++-6.dll $CI_PROJECT_DIR
- cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll $CI_PROJECT_DIR - cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll $CI_PROJECT_DIR
artifacts: artifacts:
paths: paths: