Merge branch 'xMAC94x/mirror_collab' into 'master'

dont run CI on master on mirror

See merge request veloren/veloren!2291
This commit is contained in:
Marcel 2021-05-12 13:05:28 +00:00
commit 3a437f2bda

View File

@ -36,11 +36,12 @@ before_script:
- export RUSTFLAGS="-D warnings"
- rm -rf target || echo "it seems that sometimes OLD data is left over"
# 8866215 is the user that is used to sync data to the collaboration repos
workflow:
rules:
- if: $CI_MERGE_REQUEST_IID
- if: $CI_COMMIT_TAG
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $GITLAB_USER_ID != "8866215"
include:
- local: .gitlab/CI/recompile.yml