From 86bd636a3cbd77a2600d1887c1ed62f2dad8d2d3 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Sun, 31 Oct 2021 22:39:09 +0100
Subject: [PATCH] PIPELINE
---
.gitlab-ci.yml | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c5ef115..4b89cff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,10 +100,13 @@ test:
- echo $F_BRANCH
- echo $CAOSDB_TAG
- echo $CI_COMMIT_REF_NAME
- - if ! echo "$F_BRANCH" | grep -c "^f-" ; then
+ - if echo "$F_BRANCH" | grep -c "^f-.*$"; then
+ REFTAG="${REFTAG}_F_${F_BRANCH}";
+ elif [ "$F_BRANCH" == "main" ]; then
+ F_BRANCH=main;
+ else
F_BRANCH=dev;
fi
-
- echo $F_BRANCH
- echo $CI_COMMIT_REF_NAME
- echo $CI_REGISTRY_IMAGE
@@ -225,6 +228,6 @@ store-version:
allow_failure: true
only:
- dev
- - master
+ - main
- web
--
GitLab