Fix: new versioning scheme failing with PR builds
This commit is contained in:
1 parent
9d4a420ea2
commit
66737611c3
1 file changed
+8
-7
@@ -1,9 +1,3 @@
|
|||||||
if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
|
|
||||||
{
|
|
||||||
$Env:VersionTag = "PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
|
|
||||||
Return $Env:VersionTag
|
|
||||||
}
|
|
||||||
|
|
||||||
$currentCommitSha = $Env:CurrentCommitSha
|
$currentCommitSha = $Env:CurrentCommitSha
|
||||||
$githubRepoApiUri = $Env:githubRepoApiUri #"https://api.github.com/repos/:user/:repo/"
|
$githubRepoApiUri = $Env:githubRepoApiUri #"https://api.github.com/repos/:user/:repo/"
|
||||||
$Env:VersionTag = ""
|
$Env:VersionTag = ""
|
||||||
@@ -59,5 +53,12 @@ if(!$latestTag){
|
|||||||
Return ;
|
Return ;
|
||||||
}
|
}
|
||||||
|
|
||||||
$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
|
if($Env:APPVEYOR_PULL_REQUEST_NUMBER)
|
||||||
|
{
|
||||||
|
$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-PR_$Env:APPVEYOR_PULL_REQUEST_NUMBER"
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$Env:VersionTag = "$($latestTag.tag)-$($latestTag.dist)-g$($currentCommitSha.Substring(0,7))"
|
||||||
|
}
|
||||||
Return $Env:VersionTag
|
Return $Env:VersionTag
|
||||||
Reference in new issue
Block a user