From: Yann Dirson <yann.dirson@vates.fr>
Date: Wed, 24 Jan 2024 14:19:33 +0000 (+0100)
Subject: ci: more robust parsing of Cargo.toml for UPSTREAMVERSION
X-Git-Tag: 0.4.0~3^2
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4d1fa2ba7a36408cde33e831caabdf2cd447f41d;p=xen-guest-agent.git

ci: more robust parsing of Cargo.toml for UPSTREAMVERSION

Adding a dependency as a block brings more matching lines for the
previous regexp.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb225a4..1b1ca48 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -131,7 +131,7 @@ env-setup:
             TILDEVERSION=$UPSTREAMVERSION
             RPMVERSION=$(echo $UPSTREAMVERSION | tr "-" "+")
             ;;
-      *)    UPSTREAMVERSION=$(grep "^version =" Cargo.toml | cut -d\" -f2)
+      *)    UPSTREAMVERSION=$(awk -F'"' < Cargo.toml '/^\[/ { pkg=0 }; /^\[package\]$/ { pkg=1 }; /^version = "(.*)"/ { if (pkg) print $2 }')
             # both DEB and RPM use "~" to sort pre-releases before releases
             TILDEVERSION=$(echo $UPSTREAMVERSION | tr "-" "~")
             RPMVERSION=$TILDEVERSION