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

CI tweaks, make windows build use posix mingw and copy necessary DLL files

Browse Source
This commit is contained in:
Imbris 2021-04-21 21:56:18 -04:00 committed by Avi Weinstock
parent 62db5e5a69
commit de7f7881a0
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -122,17 +122,25 @@ coverage:
.twindows: .twindows:
script: script:
- update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
- update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
- ln -s /dockercache/cache-release-windows target - ln -s /dockercache/cache-release-windows target
- rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly - rm -r target/release/incremental/veloren_* || echo "all good" # TMP FIX FOR 2021-03-22-nightly
- VELOREN_USERDATA_STRATEGY=executable cargo build --target=x86_64-pc-windows-gnu --release - VELOREN_USERDATA_STRATEGY=executable cargo build --target=x86_64-pc-windows-gnu --release
- 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/7.3-posix/libgcc_s_seh-1.dll $CI_PROJECT_DIR
- cp /usr/lib/gcc/x86_64-w64-mingw32/7.3-posix/libstdc++-6.dll $CI_PROJECT_DIR
- cp /usr/x86_64-w64-mingw32/lib/libwinpthread-1.dll $CI_PROJECT_DIR
artifacts: artifacts:
paths: paths:
- veloren-server-cli.exe - veloren-server-cli.exe
- veloren-voxygen.exe - veloren-voxygen.exe
- assets/ - assets/
- LICENSE - LICENSE
- libgcc_s_seh-1.dll
- libstdc++-6.dll
- libwinpthread-1.dll
expire_in: 1 week expire_in: 1 week
.tmacos: .tmacos:

2
.gitlab/CI/recompile.yml
View File

@ -28,7 +28,7 @@
.post-merge: .post-merge:
stage: build stage: build
tags: tags:
- veloren-docker - veloren-wgpu-docker
rules: rules:
- if: $CI_COMMIT_REF_NAME =~ /^master$/ - if: $CI_COMMIT_REF_NAME =~ /^master$/
changes: changes: