From 3ddf3bb73302980cccd7a46d57ffcc0022ab9d3a Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Tue, 23 Nov 2021 11:02:57 +0100
Subject: [PATCH] Remove rc tags from parsed versions

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03b22a4..047524d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ fetch-versions:
     - git clone https://gitlab.com/gitlab-org/omnibus-gitlab
     - cd omnibus-gitlab
     - "HALIA_VER=$(curl --request GET -L --header 'Accept: application/json' --header 'Content-Type: application/json' https://git.halia.dev/api/v4/projects/24/registry/repositories/6/tags | jq -r '.[].location' | grep -v latest | cut -d ':' -f2 | sort -V | tail -1)"
-    - "GITLAB_VER=$(git tag | sort -V | grep ce | tail -1 | cut -d '+' -f1)"
+    - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1 | cut -d '+' -f1)"
     - if [ $HALIA_VER != $GITLAB_VER ]; then echo "export NEED_UPDATE=true" > ../.env.update; fi
   artifacts:
     paths:
@@ -29,7 +29,7 @@ build-image:
     - apk add git wget
     - git clone https://gitlab.com/gitlab-org/omnibus-gitlab
     - cd omnibus-gitlab
-    - "GITLAB_VER=$(git tag | sort -V | grep ce | tail -1)"
+    - "GITLAB_VER=$(git tag | sort -V | grep -v rc | grep ce | tail -1)"
     - "GITLAB_SHORT_VER=$(echo $GITLAB_VER | cut -d '+' -f 1)"
     - git checkout $GITLAB_VER
     - "GITLAB_VER=$(echo $GITLAB_VER | tr '+' -)"