Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/Release_Process.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions tools/releaseBuild/setReleaseTag.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ $branchOnly = $branchOnly -replace '[_\-]'
if($ReleaseTag -eq 'fromBranch' -or !$ReleaseTag)
{
# Branch is named release-<semver>
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"
Expand Down