fix issue with setReleaseTag using variable meant for non-release branches during a release (#7011)

There was a regression in the script where a variable meant for non-release branches was used during releases
This commit is contained in:
Travis Plunk
2018-06-06 10:55:28 -07:00
committed by GitHub
parent cecdd1ef80
commit 4192463ce6
+3 -1
View File
@@ -21,13 +21,15 @@ if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
# Branch is named release-<semver>
if($Branch -match '^.*(release-)')
{
$releaseTag = $branchOnly -replace '^.*(release-)'
Write-verbose "release branch:" -verbose
$releaseTag = $Branch -replace '^.*(release-)'
$vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag"
Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose
Write-Host -Object "##$vstsCommandString"
}
else
{
Write-verbose "non-release branch" -verbose
# Branch is named <previewname>
# Get version from metadata and append -<previewname>
$metaDataJsonPath = Join-Path $PSScriptRoot -ChildPath '..\metadata.json'