summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml4
-rw-r--r--.gitlab/rules.yml2
2 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3071055..ea58f9b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -274,6 +274,8 @@ b:fedora35-ninja:
- .cmake_build_artifacts
- .linux_builder_tags_qt
- .run_manually
+ variables:
+ CMAKE_CI_JOB_CONTINUOUS: "true"
b:debian10-makefiles-inplace:
extends:
@@ -295,6 +297,8 @@ t:fedora35-ninja:
- b:fedora35-ninja
needs:
- b:fedora35-ninja
+ variables:
+ CMAKE_CI_JOB_CONTINUOUS: "true"
t:fedora35-ninja-multi:
extends:
diff --git a/.gitlab/rules.yml b/.gitlab/rules.yml
index a871b8f..9302da4 100644
--- a/.gitlab/rules.yml
+++ b/.gitlab/rules.yml
@@ -52,6 +52,8 @@
when: on_success
- if: '$CMAKE_CI_JOB_NIGHTLY == "true"'
when: never
+ - if: '$CMAKE_CI_PROJECT_CONTINUOUS_BRANCH != null && $CI_COMMIT_BRANCH != null && $CMAKE_CI_PROJECT_CONTINUOUS_BRANCH == $CI_COMMIT_BRANCH && $CMAKE_CI_JOB_CONTINUOUS == "true"'
+ when: on_success
- if: '($CMAKE_CI_NO_MR == "true" && $CI_MERGE_REQUEST_ID)'
when: never
- if: '$CI_MERGE_REQUEST_ID'