admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add prompt to fix conflict during backport (#19583)

Browse Source 
* Add prompt to fix conflicts

* Add function to backport all approved PRs

* Update tools/releaseTools.psm1

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>

* Update tools/releaseTools.psm1

---------

Co-authored-by: Dongbo Wang <dongbow@microsoft.com>
This commit is contained in:
Travis Plunk
2023-06-14 11:20:31 -07:00
committed by Aditya Patwardhan
co-authored by Dongbo Wang
parent 6f37176bb9
commit 2af69aec24
1 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tools/releaseTools.psm1
+44 -2
View File
@@ -759,6 +759,23 @@ function Invoke-PRBackport {
throw "$ScriptBlock fail with $LASTEXITCODE"
}
}
function script:Test-ShouldContinue {
param (
$Message
)
$continue = $false
while(!$continue) {
$input= Read-Host -Prompt ($Message + "`nType 'Yes<enter>' to continue 'No<enter>' to exit")
switch($input) {
'yes' {
$continue= $true
}
'no' {
throw "User abort"
}
}
}
}
$ErrorActionPreference = 'stop'
$pr = gh pr view $PrNumber --json 'mergeCommit,state,title' | ConvertFrom-Json
@@ -799,11 +816,36 @@ function Invoke-PRBackport {
Invoke-NativeCommand { git switch upstream/$Target $switch $branchName }
}
Invoke-NativeCommand { git cherry-pick $commitId }
try {
Invoke-NativeCommand { git cherry-pick $commitId }
}
catch {
Test-ShouldContinue -Message "Fix any conflicts with the cherry-pick."
}
if ($PSCmdlet.ShouldProcess("Create the PR")) {
gh pr create --base $Target --title $backportTitle --body "Backport #$PrNumber"
}
}
Export-ModuleMember -Function Get-ChangeLog, Get-NewOfficalPackage, Update-PsVersionInCode, Get-PRBackportReport, Invoke-PRBackport
# Backport all approved backports
# Usage:
# Invoke-PRBackportApproved -Version 7.2.12
function Invoke-PRBackportApproved {
param(
[Parameter(Mandatory)]
[semver]
$Version
)
$tagVersion = "$($Version.Major).$($Version.Minor)"
$target = "release/$ReleaseTag"
Get-PRBackportReport -Version $tagVersion |
ForEach-Object {
$prNumber = $_.Number
Invoke-PRBackport -ErrorAction Stop -PrNumber $prNumber -Target $target
}
}
Export-ModuleMember -Function Get-ChangeLog, Get-NewOfficalPackage, Update-PsVersionInCode, Get-PRBackportReport, Invoke-PRBackport, Invoke-PRBackportApproved