updated version number to look at only tags on master

This commit is contained in:
Andrew Welker
2020-03-16 13:20:07 -06:00
parent 6cf5fe5ec4
commit fe5ab01abc

View File

@@ -3,14 +3,18 @@ if ($tagCount -eq 0) {
$latestVersion = "0.0.0" $latestVersion = "0.0.0"
} }
else { else {
$latestVersions = $(git describe --tags $(git rev-list --tags='*.*.*' --max-count=10) --abbrev=0) $latestVersions = $(git describe --tags $(git tag --merged master) --abbrev=0)
$latestVersion = "" $latestVersion = [version]"0.0.0"
Foreach ($version in $latestVersions) { Foreach ($version in $latestVersions) {
Write-Output $version Write-Host $version
if ($version -match '^[1-9]+.\d+.\d+$') { try {
$latestVersion = $version if (([version]$version) -ge $latestVersion) {
Write-Output "Setting latest version to: $latestVersion" $latestVersion = $version
break Write-Host "Setting latest version to: $latestVersion"
}
} catch {
Write-Host "Unable to convert $($version). Skipping"
continue;
} }
} }
} }
@@ -18,7 +22,7 @@ $newVersion = [version]$latestVersion
$phase = "" $phase = ""
$newVersionString = "" $newVersionString = ""
switch -regex ($Env:GITHUB_REF) { switch -regex ($Env:GITHUB_REF) {
'^refs\/heads\/master\/*.' { '^refs\/heads\/master*.' {
$newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1) $newVersionString = "{0}.{1}.{2}" -f $newVersion.Major, $newVersion.Minor, ($newVersion.Build + 1)
} }
'^refs\/heads\/feature\/*.' { '^refs\/heads\/feature\/*.' {
@@ -27,7 +31,7 @@ switch -regex ($Env:GITHUB_REF) {
'^refs\/heads\/release\/*.' { '^refs\/heads\/release\/*.' {
$phase = 'rc' $phase = 'rc'
} }
'^refs\/heads\/development\/*.' { '^refs\/heads\/development*.' {
$phase = 'beta' $phase = 'beta'
} }
'^refs\/heads\/hotfix\/*.' { '^refs\/heads\/hotfix\/*.' {