mirror of
https://gitlab.com/veloren/veloren.git
synced 2024-08-30 18:12:32 +00:00
fix(ci): adjust release trigger + make sure pipelines always run
This commit is contained in:
parent
2ad8172d6f
commit
7fa71c2562
@ -36,11 +36,13 @@ before_script:
|
||||
- rm -r target || echo "target doesnt exist, which is fine"
|
||||
- ln -s /dockercache/veloren/target target
|
||||
|
||||
workflow:
|
||||
rules:
|
||||
- if: $CI_MERGE_REQUEST_IID
|
||||
- if: $CI_COMMIT_TAG
|
||||
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
|
||||
|
||||
include:
|
||||
# pipelines run for branches and tags.
|
||||
# https://docs.gitlab.com/ee/ci/yaml/#workflowrules
|
||||
# TODO: https://docs.gitlab.com/ee/ci/merge_request_pipelines/pipelines_for_merged_results/index.html#enable-pipelines-for-merged-results
|
||||
- template: "Workflows/Branch-Pipelines.gitlab-ci.yml"
|
||||
- local: .gitlab/CI/recompile.yml
|
||||
- local: .gitlab/CI/release.yml
|
||||
- local: .gitlab/CI/optional-builds.gitlab-ci.yml
|
||||
|
@ -2,7 +2,7 @@
|
||||
.recompile:
|
||||
rules:
|
||||
- changes:
|
||||
- "*.{rs,ron,toml,vox,png}"
|
||||
- "**/*.{rs,ron,toml,vox,png}"
|
||||
- "rust-toolchain"
|
||||
- ".gitlab-ci.yml"
|
||||
- "*.gitlab-ci.yml"
|
||||
- "**/*.gitlab-ci.yml"
|
||||
|
@ -1,4 +1,4 @@
|
||||
# Template to only run if pushes to master or a tag happened
|
||||
.release:
|
||||
rules:
|
||||
- if: $CI_COMMIT_REF_NAME =~ /^master.$/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+/
|
||||
- if: $CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/
|
||||
|
Loading…
Reference in New Issue
Block a user