diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml index 15b81f20064ab7648396e3973d0da6bacded5f0a..320b5b802fc8c2bae99ce2911bcb861217d9cb91 100644 --- a/.gitlab/ci/rules.gitlab-ci.yml +++ b/.gitlab/ci/rules.gitlab-ci.yml @@ -6,13 +6,15 @@ when: manual allow_failure: true -.rules:build:merge_pipeline: +.rules:build:merge_pipeline_or_dev: rules: + - if: $CI_COMMIT_BRANCH == 'dev' || $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH + when: always - if: $CI_PIPELINE_SOURCE == 'merge_request_event' && $CI_MERGE_REQUEST_TITLE !~ /^Draft:/ allow_failure: false when: always when: manual - allow_failure: true + allow_failure: false # creating release jobs only when merging to main .rules:release: diff --git a/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml b/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml index 7b33d51fbda24613c100983ffd1233e4cf47c46c..72cdb889d0f255b175dafb61306834a505ef44ab 100644 --- a/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml +++ b/.gitlab/ci/ubuntu_cpp.gitlab-ci.yml @@ -54,7 +54,7 @@ build:ubuntu_cpp:g++: needs: [] extends: - .build:ubuntu_cpp:template - - .rules:build:merge_pipeline + - .rules:build:merge_pipeline_or_dev tags: - docker parallel: @@ -73,7 +73,7 @@ build:ubuntu_cpp:clang: needs: [] extends: - .build:ubuntu_cpp:template - - .rules:build:merge_pipeline + - .rules:build:merge_pipeline_or_dev tags: - docker parallel: