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

Simplyfy builds and checks,

Browse Source 
when doing 2 builds, rust recompiles alot files and doesnt cache them, this is avoided by just call cargo build instead
This commit is contained in:
Marcel Märtens 2019-11-21 14:11:37 +01:00
parent b44792c83d
commit e0d5376852
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.gitlab-ci.yml
View File

@ -32,8 +32,7 @@ before_script:
optional-debug:linux: optional-debug:linux:
<<: *optional-debug <<: *optional-debug
script: script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose && cd .. - VELOREN_ASSETS=assets cargo build --verbose
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose && cd ..
- cp target/debug/veloren-server-cli $CI_PROJECT_DIR - cp target/debug/veloren-server-cli $CI_PROJECT_DIR
- cp target/debug/veloren-voxygen $CI_PROJECT_DIR - cp target/debug/veloren-voxygen $CI_PROJECT_DIR
- strip --strip-all veloren-server-cli - strip --strip-all veloren-server-cli
@ -49,8 +48,7 @@ optional-debug:linux:
optional-debug:windows: optional-debug:windows:
<<: *optional-debug <<: *optional-debug
script: script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu && cd .. - VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu && cd ..
- cp target/x86_64-pc-windows-gnu/debug/veloren-server-cli.exe $CI_PROJECT_DIR - cp target/x86_64-pc-windows-gnu/debug/veloren-server-cli.exe $CI_PROJECT_DIR
- cp target/x86_64-pc-windows-gnu/debug/veloren-voxygen.exe $CI_PROJECT_DIR - cp target/x86_64-pc-windows-gnu/debug/veloren-voxygen.exe $CI_PROJECT_DIR
artifacts: artifacts:
@ -72,8 +70,7 @@ optional-debug:windows:
optional-release:linux: optional-release:linux:
<<: *optional-release <<: *optional-release
script: script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --release && cd .. - VELOREN_ASSETS=assets cargo build --verbose --release
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --release && cd ..
- cp target/release/veloren-server-cli $CI_PROJECT_DIR - cp target/release/veloren-server-cli $CI_PROJECT_DIR
- cp target/release/veloren-voxygen $CI_PROJECT_DIR - cp target/release/veloren-voxygen $CI_PROJECT_DIR
- strip --strip-all veloren-server-cli - strip --strip-all veloren-server-cli
@ -89,8 +86,7 @@ optional-release:linux:
optional-release:windows: optional-release:windows:
<<: *optional-release <<: *optional-release
script: script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release && cd .. - VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release
- cd server-cli && VELOREN_ASSETS=assets cargo build --verbose --target=x86_64-pc-windows-gnu --release && cd ..
- cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe $CI_PROJECT_DIR
- cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR - cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe $CI_PROJECT_DIR
artifacts: artifacts:
@ -174,8 +170,7 @@ linux:
tags: tags:
- veloren-docker - veloren-docker
script: script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --release && cd .. - VELOREN_ASSETS=assets cargo build --release
- cd server-cli && VELOREN_ASSETS=assets cargo build --release && cd ..
- 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
- strip --strip-all veloren-server-cli - strip --strip-all veloren-server-cli
@ -200,8 +195,7 @@ windows:
tags: tags:
- veloren-docker - veloren-docker
script: script:
- cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release && cd .. - VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release
- cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu --release && cd ..
- 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: