From: Yann Dirson <yann.dirson@vates.fr>
Date: Thu, 14 Dec 2023 15:02:09 +0000 (+0100)
Subject: ci/rpm: replace - with + in git-describe version
X-Git-Tag: 0.3.0~2^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=ad5e20cbccc056cd0191d4fbd64e92a8d1c1b0b7;p=xen-guest-agent.git

ci/rpm: replace - with + in git-describe version

Signed-off-by: Yann Dirson <yann.dirson@vates.fr>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index dc810bf..7db6b33 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -100,10 +100,12 @@ env-setup:
       case "$CI_COMMIT_REF_NAME" in
       main) UPSTREAMVERSION=$(git describe)
             TILDEVERSION=$UPSTREAMVERSION
+            RPMVERSION=$(echo $UPSTREAMVERSION | tr "-" "+")
             ;;
       *)    UPSTREAMVERSION=$(grep "^version =" Cargo.toml | cut -d\" -f2)
             # both DEB and RPM use "~" to sort pre-releases before releases
             TILDEVERSION=$(echo $UPSTREAMVERSION | tr "-" "~")
+            RPMVERSION=$TILDEVERSION
             ;;
       esac
     # update channel must be the same for matching packaging and deploy
@@ -118,6 +120,7 @@ env-setup:
     - echo "UPDATE_CHANNEL=${UPDATE_CHANNEL}" > version.env
     - echo "UPSTREAMVERSION=${UPSTREAMVERSION}" >> version.env
     - echo "TILDEVERSION=${TILDEVERSION}" >> version.env
+    - echo "RPMVERSION=${RPMVERSION}" >> version.env
 
     - cat version.env
 
@@ -303,7 +306,7 @@ pkg-rpm-x86_64:
     - >-
       sed  < xen-guest-agent.spec.in > xen-guest-agent.spec
       -e "s/@@UPSTREAMVERSION@@/$UPSTREAMVERSION/"
-      -e "s/@@VERSION@@/$TILDEVERSION/"
+      -e "s/@@VERSION@@/$RPMVERSION/"
       -e "s/@@AUTHOR@@/$GITLAB_USER_NAME <$GITLAB_USER_EMAIL>/"
       -e "s/@@DATE@@/$(date +'%a %b %d %Y')/"
     - dnf builddep xen-guest-agent.spec -y