From d4848d373de6d8258d7959a9a0dfe161b0d19ab8 Mon Sep 17 00:00:00 2001 From: Travis Plunk Date: Tue, 19 Feb 2019 10:47:39 -0800 Subject: [PATCH] Support release branches based on the forward slash separator (#8903) --- tools/releaseBuild/setReleaseTag.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/releaseBuild/setReleaseTag.ps1 b/tools/releaseBuild/setReleaseTag.ps1 index 7dbe626f08..64b6331bf6 100644 --- a/tools/releaseBuild/setReleaseTag.ps1 +++ b/tools/releaseBuild/setReleaseTag.ps1 @@ -19,10 +19,10 @@ $branchOnly = $branchOnly -replace '[_\-]' if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag) { # Branch is named release- - if($Branch -match '^.*(release-)') + if($Branch -match '^.*(release[-/])') { Write-verbose "release branch:" -verbose - $releaseTag = $Branch -replace '^.*(release-)' + $releaseTag = $Branch -replace '^.*(release[-/])' $vstsCommandString = "vso[task.setvariable variable=$Variable]$releaseTag" Write-Verbose -Message "setting $Variable to $releaseTag" -Verbose Write-Host -Object "##$vstsCommandString"