From e3519aced48eacb72e3dce9662061964f9494adc Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Mar 2022 15:02:27 -0500 Subject: ci: configure rules to enable dependent jbos in continuous pipeline Apply the rules from commit ff72dbfb14 (gitlab-ci: configure rules to enable continuous builds of staged MRs, 2020-09-30, v3.19.0-rc1~70^2~1) and commit 71665c8cb9 (gitlab-ci: Clarify conditions enabling jobs for continuous build of stage, 2021-05-05, v3.21.0-rc1~218^2) to dependent jobs too. --- .gitlab/rules.yml | 2 ++ 1 file changed, 2 insertions(+) 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' -- cgit v0.12 From bba3d65bb6882ec3d2643fc5de1ce2030a8d2279 Mon Sep 17 00:00:00 2001 From: Brad King Date: Wed, 2 Mar 2022 13:53:55 -0500 Subject: ci: add fedora35-ninja build and test jobs in continuous pipeline --- .gitlab-ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c811092..4dab6e0 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" t:fedora35-ninja: extends: @@ -286,6 +288,8 @@ t:fedora35-ninja: - b:fedora35-ninja needs: - b:fedora35-ninja + variables: + CMAKE_CI_JOB_CONTINUOUS: "true" t:fedora35-ninja-multi: extends: -- cgit v0.12