From b3b65b8cfdbaa972d880b421311852a2e0e7ecb4 Mon Sep 17 00:00:00 2001
From: fejao <mail@fejao.de>
Date: Wed, 12 Feb 2025 14:53:02 +0000
Subject: [PATCH] Adding role dependencies submodule
---
.gitlab-ci.yml | 3 ++-
ci-cd/templates/all-roles-b4-merge.yml | 6 ------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5160129..a4403ad 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -63,7 +63,8 @@ include:
### BEFORE MREGE REQUEST
- local: ci-cd/templates/all-roles-b4-merge.yml
rules:
- - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"
+ # - if: $CI_PIPELINE_SOURCE == "push" && $CI_COMMIT_BRANCH == "master"
+ - if: $CI_COMMIT_REF_NAME == "main"
####
# rules:
# ### WORKS
diff --git a/ci-cd/templates/all-roles-b4-merge.yml b/ci-cd/templates/all-roles-b4-merge.yml
index 33b4263..8776af7 100644
--- a/ci-cd/templates/all-roles-b4-merge.yml
+++ b/ci-cd/templates/all-roles-b4-merge.yml
@@ -6,12 +6,6 @@
variables:
AUTHOR: fejao
-# workflow:
-# rules:
-# - if: $CI_MERGE_REQUEST_ID
-# when: always
-# - when: never
-
###
### INCLUDE
###
--
GitLab