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 eb225a484721fcdfb451e10103ab6a07e1d38f38..1b1ca488853ee1a7e94e7fe384a495c430f6bac8 100644 (file)
--- 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