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

Update CI and docker files to work with changes to data folder structure

Browse Source
This commit is contained in:
Imbris 2020-10-05 04:48:29 -04:00
parent 308cca0dc9
commit 522880a0ab
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,7 +34,7 @@ benchmarks:
.tlinux: .tlinux:
script: script:
- ln -s /dockercache/cache-release-linux target - ln -s /dockercache/cache-release-linux target
- cargo build --release - VELOREN_USERDATA_STRATEGY=executable cargo build --release
- cp -r target/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/release/veloren-server-cli $CI_PROJECT_DIR
- cp -r target/release/veloren-voxygen $CI_PROJECT_DIR - cp -r target/release/veloren-voxygen $CI_PROJECT_DIR
artifacts: artifacts:
@ -48,7 +48,7 @@ benchmarks:
.twindows: .twindows:
script: script:
- ln -s /dockercache/cache-release-windows target - ln -s /dockercache/cache-release-windows target
- 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
artifacts: artifacts:
@ -62,7 +62,7 @@ benchmarks:
.tmacos: .tmacos:
script: script:
- ln -s /dockercache/cache-release-macos target - ln -s /dockercache/cache-release-macos target
- PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release - VELOREN_USERDATA_STRATEGY=executable PATH="/dockercache/osxcross/target/bin:$PATH" COREAUDIO_SDK_PATH=/dockercache/osxcross/target/SDK/MacOSX10.13.sdk CC=o64-clang CXX=o64-clang++ cargo build --target x86_64-apple-darwin --release
- cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR - cp -r target/x86_64-apple-darwin/release/veloren-server-cli $CI_PROJECT_DIR
- cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR - cp -r target/x86_64-apple-darwin/release/veloren-voxygen $CI_PROJECT_DIR
artifacts: artifacts:

2
server-cli/docker-compose.yml
View File

@ -9,7 +9,7 @@ services:
- "14005:14005" - "14005:14005"
restart: on-failure:0 restart: on-failure:0
volumes: volumes:
- "./saves:/opt/saves" - "./userdata:/opt/userdata"
environment: environment:
- RUST_LOG=debug,common::net=info - RUST_LOG=debug,common::net=info
watchtower: watchtower: