diff --git a/.github/ISSUE_TEMPLATE/Release_Process.md b/.github/ISSUE_TEMPLATE/Release_Process.md index 2d0dba392d..be9401c04f 100644 --- a/.github/ISSUE_TEMPLATE/Release_Process.md +++ b/.github/ISSUE_TEMPLATE/Release_Process.md @@ -19,7 +19,7 @@ Please **only** use this template if you are a maintainer. - [ ] Verify that `PowerShell-Native` has been updated/released as needed. - [ ] Check for `PowerShellGet` and `PackageManagement` release plans. - [ ] Start process to sync Azure DevOps artifacts feed such as modules and NuGet packages. -- [ ] Create a private branch named `release-v6.x.x` in Azure Dev Ops repository. +- [ ] Create a private branch named `release/v6.x.x` in Azure DevOps repository. All release related changes should happen in this branch. - [ ] Prepare packages - [ ] Build release packages 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"