Skip to content

Add prompt to fix conflict during backport #19583

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TravisEz13 merged 4 commits into from
May 1, 2023
Merged

Add prompt to fix conflict during backport #19583

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e778c85
Add prompt to fix conflicts
TravisEz13 Apr 26, 2023
745e608
Add function to backport all approved PRs
TravisEz13 Apr 26, 2023
d15d90f
Update tools/releaseTools.psm1
TravisEz13 Apr 28, 2023
fcf3fb6
Update tools/releaseTools.psm1
TravisEz13 Apr 28, 2023
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
46 changes: 44 additions & 2 deletions tools/releaseTools.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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