diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d7195ed2a..1157f3d71b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -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 diff --git a/.gitlab/CI/recompile.yml b/.gitlab/CI/recompile.yml index 63b8e0ef7a..5f481107e0 100644 --- a/.gitlab/CI/recompile.yml +++ b/.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: