mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
CI tweaks, make windows build use posix mingw and copy necessary DLL files
This commit is contained in:
parent
77689d1420
commit
7f8877988d
@ -75,17 +75,25 @@ coverage:
|
|||||||
.twindows:
|
.twindows:
|
||||||
image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-windows:${CACHE_IMAGE_TAG}
|
image: registry.gitlab.com/veloren/veloren-docker-ci/cache/release-windows:${CACHE_IMAGE_TAG}
|
||||||
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/target target
|
- ln -s /dockercache/target 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:
|
||||||
|
Loading…
Reference in New Issue
Block a user