Merge branch 'imbris/nightly-ci-improvement' into 'master'

Avoid extra jobs on nightly builds

See merge request veloren/veloren!2367
This commit is contained in:
Imbris 2021-06-03 20:54:16 +00:00
commit 61cec869c1
2 changed files with 5 additions and 2 deletions

View File

@ -10,6 +10,7 @@
- ".gitlab-ci.yml" - ".gitlab-ci.yml"
- "**/*.yml" - "**/*.yml"
# TODO: appears unused
# like .recompile-branch but will run on master too # like .recompile-branch but will run on master too
.recompile: .recompile:
rules: rules:
@ -24,6 +25,8 @@
.post-merge: .post-merge:
stage: build stage: build
rules: rules:
- if: $CI_PIPELINE_SOURCE == "schedule"
when: never
- if: $CI_COMMIT_REF_NAME =~ /^master$/ - if: $CI_COMMIT_REF_NAME =~ /^master$/
changes: changes:
- "**/*.{glsl,rs,ron,toml,vox,png}" - "**/*.{glsl,rs,ron,toml,vox,png}"

View File

@ -11,11 +11,11 @@
.release: .release:
stage: build stage: build
rules: rules:
- 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]+/ - if: $CI_PIPELINE_SOURCE != "schedule" && ($CI_COMMIT_REF_NAME =~ /^master$/ || $CI_COMMIT_TAG =~ /^v[0-9]+\.[0-9]+\.[0-9]+/ || $CI_COMMIT_REF_NAME =~ /^r[0-9]+\.[0-9]+/)
when: always when: always
- when: never - when: never
# Template to only run if pushes to master or a tag happened # Template to only run if pushes to master or a tag happened for scheduled builds
.release-nightly-tmp-fix-airshipper: .release-nightly-tmp-fix-airshipper:
stage: build-nightly stage: build-nightly
rules: rules: