From 3d7dd03d5c0f038fce9bbadf751189182dca63d8 Mon Sep 17 00:00:00 2001
From: Dimitrios Giannopoulos <dimit.giannopoulos@upnet.gr>
Date: Tue, 19 Dec 2023 12:03:51 +0000
Subject: [PATCH] moved branch logic to gitlab ci
---
.gitlab-ci.yml | 7 ++++++-
ci-templates/default.yml | 17 -----------------
2 files changed, 6 insertions(+), 18 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index af3947a..af9ac79 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,11 @@
include:
- ci-templates/default.yml
- - ci-templates/build_unprotected.yml
+ - local: ci-templates/build.yml
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED == "true"
+ - local: ci-templates/build_unprotected.yml
+ rules:
+ - if: $CI_COMMIT_REF_PROTECTED != "true"
maven_build:
extends: .maven_build
diff --git a/ci-templates/default.yml b/ci-templates/default.yml
index ede18c0..8b0f900 100644
--- a/ci-templates/default.yml
+++ b/ci-templates/default.yml
@@ -5,7 +5,6 @@ stages:
- post
- security
-# Default configuration for all jobs
.default:
variables:
DEFAULT_VERSION: "1.2.0-SNAPSHOT"
@@ -18,19 +17,3 @@ stages:
else
export APP_VERSION=$DEFAULT_VERSION
fi
-
-# Configuration for jobs on protected branches
-.default_protected:
- extends: .default
- rules:
- - if: $CI_COMMIT_REF_PROTECTED == "true"
-
-# Configuration for jobs on unprotected branches
-.default_unprotected:
- # extends: .default
- variables:
- APP_VERSION: $CI_COMMIT_REF_NAME
- rules:
- - if: $CI_COMMIT_REF_PROTECTED != "true"
- artifacts:
- expire_in: 1 day
--
GitLab