From bef52a1431bffab97388ce2fab33033b0ad4f855 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9goire?= <gregoire.kubler@proton.me>
Date: Wed, 17 Jul 2024 10:22:17 +0200
Subject: [PATCH] feat : optionnal build clang & g++ are always executed in dev
& main branches
---
.gitlab/ci/rules.gitlab-ci.yml | 6 ++++--
.gitlab/ci/ubuntu_cpp.gitlab-ci.yml | 4 ++--
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab/ci/rules.gitlab-ci.yml b/.gitlab/ci/rules.gitlab-ci.yml
index 15b81f2..320b5b8 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 7b33d51..72cdb88 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:
--
GitLab