Skip to content

fix(ops): wait for branch head convergence in force-align #9

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
svelderrainruiz merged 1 commit into from
Feb 26, 2026
Merged

fix(ops): wait for branch head convergence in force-align #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 28 additions & 1 deletion scripts/Invoke-ControlledForkForceAlign.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,33 @@ function Wait-ForCiSuccess {
throw "Timed out waiting for CI Pipeline success for $TargetSha in $Repository@$BranchName."
}

function Wait-ForBranchHeadParity {
param(
[Parameter(Mandatory = $true)]
[string]$Repository,
[Parameter(Mandatory = $true)]
[string]$BranchName,
[Parameter(Mandatory = $true)]
[string]$TargetSha,
[Parameter()]
[int]$TimeoutSeconds = 60,
[Parameter()]
[int]$PollSeconds = 3
)

$deadlineUtc = (Get-Date).ToUniversalTime().AddSeconds($TimeoutSeconds)
while ((Get-Date).ToUniversalTime() -lt $deadlineUtc) {
$head = Invoke-GhRaw -Arguments @('api', "repos/$Repository/commits/$BranchName", '--jq', '.sha') -Description "query '$Repository@$BranchName' head SHA"
if ([string]$head -eq [string]$TargetSha) {
return $head
}
Start-Sleep -Seconds $PollSeconds
}

$currentHead = Invoke-GhRaw -Arguments @('api', "repos/$Repository/commits/$BranchName", '--jq', '.sha') -Description "query '$Repository@$BranchName' final head SHA"
throw "Timed out waiting for '$Repository@$BranchName' to converge to '$TargetSha'. current='$currentHead'"
}

if (-not (Get-Command -Name 'gh' -ErrorAction SilentlyContinue)) {
throw 'GitHub CLI (gh) is required.'
}
Expand Down Expand Up @@ -330,7 +357,7 @@ try {
}

$forkHeadAfter = if ($DryRun) { $upstreamHead } else {
Invoke-GhRaw -Arguments @('api', "repos/$ForkRepository/commits/$Branch", '--jq', '.sha') -Description "query fork head SHA after alignment"
Wait-ForBranchHeadParity -Repository $ForkRepository -BranchName $Branch -TargetSha $upstreamHead -TimeoutSeconds 60 -PollSeconds 3
}
$parity = ($forkHeadAfter -eq $upstreamHead)
if (-not $parity) {
Expand Down