lin-epics-modules/require
0
0
Fork 0
forked from epics_driver_modules/require
Code Pull Requests Activity

Another problem. New fix try: do not consider branch names as version numbers

Browse Source
This commit is contained in:
zimoch
2021-01-13 11:11:33 +01:00
parent ab393dd6ac
commit 9f989a5abf
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
App/tools/getVersion.pl
+3 -1
View File
@@ -216,6 +216,8 @@ sub parse_git_output {
say STDERR "no tag on this version => version test";
$version = "test";
}
elsif ($line =~ /On branch/) {
}
elsif ($line =~ /^([0-9]+)\.([0-9]+)(\.([0-9]+))?$/) {
my $major = $1;
my $minor = $2;
@@ -223,7 +225,7 @@ 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-Z]+[a-zA-Z0-9]*_([0-9]+)_([0-9]+)(_([0-9]+))?$/) {
my $major = $1;
my $minor = $2;
my $patch = $4 || "0";