Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'songtronix/fix-ci' into 'master'

Browse Source 
fix(ci): run pipeline for branches and tags

See merge request veloren/veloren!1015
This commit is contained in:
Songtronix 2020-05-24 11:19:24 +00:00
commit b849f654c5
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci.yml
View File

@ -37,6 +37,10 @@ before_script:
- ln -s /dockercache/veloren/target target
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