mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
test 1
This commit is contained in:
parent
9c59033976
commit
5546e6d4ba
@ -37,9 +37,9 @@ before_script:
|
||||
|
||||
workflow:
|
||||
rules:
|
||||
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
|
||||
- if: $CI_MERGE_REQUEST_IID
|
||||
- if: $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
|
||||
include:
|
||||
- local: .gitlab/CI/recompile.yml
|
||||
|
@ -4,13 +4,7 @@
|
||||
- veloren-docker
|
||||
rules:
|
||||
- if: $CI_COMMIT_REF_NAME !~ /^master$/
|
||||
# No '-' here is *very* important: https://docs.gitlab.com/ee/ci/yaml/#complex-rule-clauses
|
||||
changes:
|
||||
- "**/*.{glsl,rs,ron,toml,vox,png}"
|
||||
- "rust-toolchain"
|
||||
- "Cargo.lock"
|
||||
- ".gitlab-ci.yml"
|
||||
- "**/*.yml"
|
||||
when: manual
|
||||
|
||||
# like .recompile-branch but will run on master too
|
||||
.recompile:
|
||||
|
Loading…
Reference in New Issue
Block a user