From 5d755629420e856b179f7612d051e1e78a2a280d Mon Sep 17 00:00:00 2001 From: Forest Date: Sat, 27 Apr 2019 05:25:19 -0400 Subject: [PATCH] Fixed some nightly issues Former-commit-id: b1c3ce1e376aceb4a34fa98b9ce6ec99b708881e --- .gitlab-ci.yml | 160 +++++++++++++++++++++++++++++++------------------ 1 file changed, 103 insertions(+), 57 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b992ebcf08..07397f28e2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,7 +45,6 @@ build-voxygen: - docker script: - (cd voxygen && cargo build) - allow_failure: false build-server-cli: stage: build @@ -54,7 +53,6 @@ build-server-cli: - docker script: - (cd server-cli && cargo build) - allow_failure: false ############# # TEST @@ -67,7 +65,6 @@ unittests: - docker script: - cargo test - allow_failure: false benchmarktests: stage: test @@ -76,12 +73,96 @@ benchmarktests: - docker script: - cargo bench - allow_failure: true + +############# +# POST-BUILD +############# + +clean-code: + stage: post-build + image: registry.gitlab.com/veloren/veloren-docker-ci + tags: + - docker + script: + - cargo fmt --all -- --check + +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" + +clippy: + stage: post-build + image: registry.gitlab.com/veloren/veloren-docker-ci + tags: + - 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" ############# # EXECUTABLE ############# +commit-linux-debug: + stage: executable + image: registry.gitlab.com/veloren/veloren-docker-ci + tags: + - docker + script: + - (cd voxygen && VELOREN_ASSETS=assets cargo build) + - (cd server-cli && VELOREN_ASSETS=assets cargo build) + - rm -r -f commit-build + - mkdir commit-build + - cp target/debug/veloren-server-cli commit-build + - 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 + except: + - schedules + artifacts: + paths: + - commit-linux-debug.tar.bz2 + expire_in: 1 week + only: + refs: + - master + +commit-windows-debug: + stage: executable + image: registry.gitlab.com/veloren/veloren-docker-ci + tags: + - 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) + - rm -r -f commit-build + - mkdir commit-build + - cp target/x86_64-pc-windows-gnu/debug/veloren-server-cli.exe commit-build + - 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 + except: + - schedules + artifacts: + paths: + - commit-windows-debug.zip + expire_in: 1 week + only: + refs: + - master + + +############# +# NIGHTLY +############# + nightly-linux-optimized: stage: executable image: registry.gitlab.com/veloren/veloren-docker-ci @@ -90,15 +171,16 @@ nightly-linux-optimized: script: - (cd voxygen && VELOREN_ASSETS=assets cargo build --release) - (cd server-cli && VELOREN_ASSETS=assets cargo build --release) - - rm -r -f nightly - - mkdir nightly - - cp target/release/veloren-server-cli nightly - - cp target/release/veloren-voxygen nightly - - cp -r assets nightly/ - - cp -r voxygen/shaders nightly/ + - rm -r -f nightly-build + - mkdir nightly-build + - cp target/release/veloren-server-cli nightly-build + - 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 - when: on_success + - tar -cvjSf nightly-linux-optimized.tar.bz2 nightly-build + only: + - schedules artifacts: paths: - nightly-linux-optimized.tar.bz2 @@ -115,15 +197,16 @@ nightly-windows-optimized: 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) - - rm -r -f nightly - - mkdir nightly - - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe nightly - - cp target/x86_64-pc-windows-gnu/release/veloren-voxygen.exe nightly - - cp -r assets nightly/ - - cp -r voxygen/shaders nightly/ + - rm -r -f nightly-build + - mkdir nightly-build + - cp target/x86_64-pc-windows-gnu/release/veloren-server-cli.exe nightly-build + - 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 - when: on_success + - zip -r nightly-windows-optimized.zip nightly-build + only: + - schedules artifacts: paths: - nightly-windows-optimized.zip @@ -131,40 +214,3 @@ nightly-windows-optimized: only: refs: - master - -############# -# POST-BUILD -############# - -clean-code: - stage: post-build - image: registry.gitlab.com/veloren/veloren-docker-ci - tags: - - docker - script: - - rustup component add rustfmt-preview - - cargo fmt --all -- --check - allow_failure: true - -coverage: - stage: post-build - image: registry.gitlab.com/veloren/veloren-docker-ci - tags: - - docker - script: - - if cargo install --list | grep -i "cargo-tarpaulin"; then - echo "tarpaulin already installed"; - else - RUSTFLAGS="--cfg procmacro2_semver_exempt" cargo install cargo-tarpaulin; - fi - - cargo tarpaulin --skip-clean --all || echo "There is a problem in tarpaulin which sometimes fails" - -clippy: - stage: post-build - image: registry.gitlab.com/veloren/veloren-docker-ci - tags: - - docker - script: - - rustup component add clippy-preview --toolchain=nightly - - 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