From 29f4de9cb37fa99756377ff2bd515535c1bc79ef Mon Sep 17 00:00:00 2001 From: Dirk Zimoch Date: Mon, 12 Aug 2024 10:03:51 +0200 Subject: [PATCH] fix recognition of some special tag patterns like F_1_2_2_O_1_0_2 --- App/tools/getVersion.pl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/App/tools/getVersion.pl b/App/tools/getVersion.pl index 22d4700..f6d7c1d 100755 --- a/App/tools/getVersion.pl +++ b/App/tools/getVersion.pl @@ -141,11 +141,11 @@ sub parse_git_output { $version = "$major.$minor.$patch"; say STDERR "Checking tag $line => version $version"; } - elsif ($line =~ /^([a-zA-Z][a-zA-Z0-9]*_)+([0-9]+)_([0-9]+)(_([0-9]+))?$/) { + elsif ($line =~ /^[a-zA-Z0-9_]*[a-zA-Z][0-9]*_([0-9]+)_([0-9]+)(_([0-9]+))?$/) { $tag = $line; - my $major = $2; - my $minor = $3; - my $patch = $5 || "0"; + my $major = $1; + my $minor = $2; + my $patch = $4 || "0"; $version = "$major.$minor.$patch"; say STDERR "Checking tag $line => version $version"; }