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 'fix-ci' into 'master'

Browse Source 
first rule evaluated to never, switched that

See merge request veloren/veloren!1086
This commit is contained in:
Marcel 2020-06-17 09:09:09 +00:00
commit 71a49b0e22
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab/CI/publish.gitlab-ci.yml
View File

@ -5,9 +5,9 @@
tags: tags:
- veloren-docker - veloren-docker
rules: rules:
- when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
when: always when: always
- when: never
docker: docker:
extends: .publish extends: .publish

4
.gitlab/CI/release.yml
View File

@ -4,10 +4,10 @@
tags: tags:
- veloren-docker - veloren-docker
rules: rules:
- when: manual
allow_failure: true
- 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]+/ || $CI_PIPELINE_SOURCE == "schedule" - 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]+/ || $CI_PIPELINE_SOURCE == "schedule"
when: never when: never
- when: manual
allow_failure: true
# Template to only run if pushes to master or a tag happened # Template to only run if pushes to master or a tag happened
.release: .release: