From a610db5cfc3faa7ed946666d77d3f30a4bffda6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcel=20M=C3=A4rtens?= Date: Fri, 23 Apr 2021 17:47:55 +0200 Subject: [PATCH] have a seperate stage for scheduled builds --- .gitlab-ci.yml | 1 + .gitlab/CI/build.gitlab-ci.yml | 16 ++++++++++++++++ .gitlab/CI/release.yml | 10 ++++++++++ 3 files changed, 27 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9d7195ed2a..2c3c78b377 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,6 @@ stages: - check + - build-nightly - build - publish diff --git a/.gitlab/CI/build.gitlab-ci.yml b/.gitlab/CI/build.gitlab-ci.yml index fd272f2f06..e544c4e7ee 100644 --- a/.gitlab/CI/build.gitlab-ci.yml +++ b/.gitlab/CI/build.gitlab-ci.yml @@ -112,6 +112,22 @@ macos: - .tmacos - .release +# build on schedule quickfix till airshipper 0.5 +air-linux: + extends: + - .tlinux + - .release-nightly-tmp-fix-airshipper + +air-windows: + extends: + - .twindows + - .release-nightly-tmp-fix-airshipper + +air-macos: + extends: + - .tmacos + - .release-nightly-tmp-fix-airshipper + # if NOT release or master, allow optional builds opt-linux: extends: diff --git a/.gitlab/CI/release.yml b/.gitlab/CI/release.yml index 770228a596..b87f56c9d8 100644 --- a/.gitlab/CI/release.yml +++ b/.gitlab/CI/release.yml @@ -17,4 +17,14 @@ 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]+/ when: always + - when: never + +# Template to only run if pushes to master or a tag happened +.release-nightly-tmp-fix-airshipper: + stage: build-nightly + tags: + - veloren-docker + rules: + - 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 \ No newline at end of file