diff --git a/.gitlab/CI/recompile.yml b/.gitlab/CI/recompile.yml index 07a7682a97..bc4579e191 100644 --- a/.gitlab/CI/recompile.yml +++ b/.gitlab/CI/recompile.yml @@ -10,6 +10,7 @@ - ".gitlab-ci.yml" - "**/*.yml" +# TODO: appears unused # like .recompile-branch but will run on master too .recompile: rules: @@ -24,6 +25,8 @@ .post-merge: stage: build rules: + - if: $CI_PIPELINE_SOURCE == "schedule" + when: never - if: $CI_COMMIT_REF_NAME =~ /^master$/ changes: - "**/*.{glsl,rs,ron,toml,vox,png}" diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml index c692b1f148..06556fa05c 100644 --- a/.gitlab/CI/release.yml +++ b/.gitlab/CI/release.yml @@ -11,11 +11,11 @@ .release: stage: build 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: 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: stage: build-nightly rules: