From 09fc0a7137130178a970fa27fa35aa24f5020a58 Mon Sep 17 00:00:00 2001
From: lukas leufen <l.leufen@fz-juelich.de>
Date: Wed, 8 Jun 2022 11:20:41 +0200
Subject: [PATCH] use git describe with match flag
---
.gitlab-ci.yml | 6 +++---
CI/create_version_badge.sh | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4a59b5b9..18162937 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,9 +11,9 @@ version:
- leap
- zam347
- base
- only:
- - master
- - tags
+# only:
+# - master
+# - tags
script:
- chmod +x ./CI/update_badge.sh
- chmod +x ./CI/create_version_badge.sh
diff --git a/CI/create_version_badge.sh b/CI/create_version_badge.sh
index c7a85af2..87ceae3c 100644
--- a/CI/create_version_badge.sh
+++ b/CI/create_version_badge.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-VERSION="$(git describe master)"
+VERSION="$(git describe --match v[0-9]*.[0-9]*.[0-9]* --abbrev=0)"
COLOR="blue"
BADGE_NAME="version"
--
GitLab