Merge branch 'sam/move-ci-stages' into 'master'

Moved coverage and benchmarks to only run post-merge.

See merge request veloren/veloren!2145
This commit is contained in:
Samuel Keiffer 2021-04-18 19:50:05 +00:00
commit c819f259ab
2 changed files with 16 additions and 2 deletions

View File

@ -13,7 +13,7 @@ unittests:
max: 2
benchmarks:
extends: .recompile-branch
extends: .post-merge
stage: build
tags:
- veloren-benchmark
@ -38,7 +38,7 @@ benchmarks:
# Coverage is needed on master for the README.md badge to work
# tmp remove simd as it doesnt work with tarpaulin: https://github.com/rust-lang/rust/issues/77529
coverage:
extends: .recompile
extends: .post-merge
stage: build
script:
- ln -s /dockercache/cache-tarpaulin target

View File

@ -23,3 +23,17 @@
- "Cargo.lock"
- ".gitlab-ci.yml"
- "**/*.yml"
# Template to only run these after a branch has merged to master
.post-merge:
stage: build
tags:
- veloren-docker
rules:
- if: $CI_COMMIT_REF_NAME =~ /^master$/
changes:
- "**/*.{glsl,rs,ron,toml,vox,png}"
- "rust-toolchain"
- "Cargo.lock"
- ".gitlab-ci.yml"
- "**/*.yml"