Merge topic 'ci-continuous'

bba3d65bb6 ci: add fedora35-ninja build and test jobs in continuous pipeline
e3519aced4 ci: configure rules to enable dependent jbos in continuous pipeline

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7034
This commit is contained in:
Brad King 2022-03-03 16:44:16 +00:00 committed by Kitware Robot
commit 8c84b2e468
2 changed files with 6 additions and 0 deletions

View File

@ -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:

View File

@ -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'