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

fix my CodeReview,

Browse Source 
no need to remove old zip because we remove the whole bin folder now
no need to copy archive at the end, just upload the archive in `bin/`


Former-commit-id: 05c6faf144e67169336a2cdcb5817ac9998e170c
This commit is contained in:
Forest Anderson 2019-04-29 14:05:53 +00:00
parent c95bee9838
commit 1ed043d70e
2 changed files with 35 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.gitlab-ci.yml
View File

@ -10,12 +10,14 @@ variables:
GIT_STRATEGY: none
before_script:
- mkdir -p /cache/veloren
- rm -rf /cache/veloren/bin
- cd /cache/veloren
- if [ -d .git ]; then
echo "is git dir";
else
git clone $CI_REPOSITORY_URL . ;
fi;
- mkdir -p /cache/veloren/bin
- rm -f .git/index.lock
- rm -f .git/shallow.lock
- rm -f .git/HEAD.lock
@ -42,7 +44,7 @@ build-voxygen:
stage: build
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- (cd voxygen && cargo build)
@ -50,7 +52,7 @@ build-server-cli:
stage: build
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- (cd server-cli && cargo build)
@ -62,7 +64,7 @@ unittests:
stage: test
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- cargo test
@ -70,7 +72,7 @@ benchmarktests:
stage: test
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- cargo bench
allow_failure: true
@ -84,25 +86,27 @@ clean-code:
stage: post-build
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- cargo fmt --all -- --check
allow_failure: true
coverage:
stage: post-build
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
script:
- cargo tarpaulin --skip-clean --all || echo "There is a problem in tarpaulin which sometimes fails"
allow_failure: true
# # Coverage needs to be disabled until an issue in the Rust compiler is fixed
# # https://github.com/rust-lang/rust/issues/58375
# coverage:
# stage: post-build
# image: registry.gitlab.com/veloren/veloren-docker-ci
# tags:
# - veloren-docker
# script:
# - cargo tarpaulin --all
# allow_failure: true
clippy:
stage: post-build
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- cargo clippy --all -- -D clippy || echo "This job is disabled, because we are not activly using it now, so we dont want to see yellow failed partly"
allow_failure: true
@ -115,7 +119,7 @@ commit-linux-debug:
stage: executable
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- (cd voxygen && VELOREN_ASSETS=assets cargo build)
- (cd server-cli && VELOREN_ASSETS=assets cargo build)
@ -125,25 +129,22 @@ commit-linux-debug:
- cp target/debug/veloren-voxygen commit-build
- cp -r assets commit-build/
- cp -r voxygen/shaders commit-build/
- rm -f commit-linux-debug.tar.bz2
- tar -cvjSf commit-linux-debug.tar.bz2 commit-build
- cp commit-linux-debug.tar.bz2 $CI_PROJECT_DIR
- tar -cvjSf bin/commit-linux-debug.tar.bz2 commit-build
artifacts:
paths:
- commit-linux-debug.tar.bz2
- bin/commit-linux-debug.tar.bz2
expire_in: 1 week
except:
- schedules
only:
refs:
- master
- add-docker-gitlab-ci
commit-windows-debug:
stage: executable
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- (cd voxygen && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
- (cd server-cli && VELOREN_ASSETS=assets cargo build --target=x86_64-pc-windows-gnu)
@ -153,19 +154,16 @@ commit-windows-debug:
- cp target/x86_64-pc-windows-gnu/debug/veloren-voxygen.exe commit-build
- cp -r assets commit-build/
- cp -r voxygen/shaders commit-build/
- rm -f commit-windows-debug.zip
- zip -r commit-windows-debug.zip commit-build
- cp commit-windows-debug.zip $CI_PROJECT_DIR
- zip -r bin/commit-windows-debug.zip commit-build
artifacts:
paths:
- commit-windows-debug.zip
- bin/commit-windows-debug.zip
expire_in: 1 week
except:
- schedules
only:
refs:
- master
- add-docker-gitlab-ci
#############
# NIGHTLY
@ -175,7 +173,7 @@ nightly-linux-optimized:
stage: executable
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- (cd voxygen && VELOREN_ASSETS=assets cargo build --release)
- (cd server-cli && VELOREN_ASSETS=assets cargo build --release)
@ -185,12 +183,10 @@ nightly-linux-optimized:
- cp target/release/veloren-voxygen nightly-build
- cp -r assets nightly-build/
- cp -r voxygen/shaders nightly-build/
- rm -f nightly-linux-optimized.tar.bz2
- tar -cvjSf nightly-linux-optimized.tar.bz2 nightly-build
- cp nightly-linux-optimized.zip $CI_PROJECT_DIR
- tar -cvjSf bin/nightly-linux-optimized.tar.bz2 nightly-build
artifacts:
paths:
- nightly-linux-optimized.tar.bz2
- bin/nightly-linux-optimized.tar.bz2
expire_in: 2 days
only:
- schedules
@ -199,7 +195,7 @@ nightly-windows-optimized:
stage: executable
image: registry.gitlab.com/veloren/veloren-docker-ci
tags:
- docker
- veloren-docker
script:
- (cd voxygen && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
- (cd server-cli && VELOREN_ASSETS=assets cargo build --release --target=x86_64-pc-windows-gnu)
@ -209,12 +205,10 @@ nightly-windows-optimized:
- cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe nightly-build
- cp -r assets nightly-build/
- cp -r voxygen/shaders nightly-build/
- rm -f nightly-windows-optimized.zip
- zip -r nightly-windows-optimized.zip nightly-build
- cp nightly-windows-optimized.zip $CI_PROJECT_DIR
- zip -r bin/nightly-windows-optimized.zip nightly-build
artifacts:
paths:
- nightly-windows-optimized.zip
- bin/nightly-windows-optimized.zip
expire_in: 2 days
only:
- schedules

5
README.md
View File

@ -2,6 +2,11 @@
<img alt="Veloren logo on a screenshot" src="https://cdn.discordapp.com/attachments/449602562165833760/521121348886593547/veloren_image.png">
</p>
[![pipeline status](https://gitlab.com/veloren/veloren/badges/master/pipeline.svg)](https://gitlab.com/veloren/veloren/commits/master)
[![coverage report](https://gitlab.com/veloren/veloren/badges/master/coverage.svg)](https://gitlab.com/veloren/veloren/commits/master)
[![license](https://img.shields.io/github/license/veloren/veloren.svg)](https://gitlab.com/veloren/veloren/blob/master/LICENSE)
[![discord](https://img.shields.io/discord/449602562165833758.svg)](https://discord.gg/WEXSY9h)
## Welcome To Veloren!
Veloren is a multiplayer voxel RPG written in Rust. Veloren takes inspiration from games such as Cube World, Minecraft and Dwarf Fortress. The game is currently under heavy development, but is playable.