mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
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:
commit
c819f259ab
@ -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
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user