-
Notifications
You must be signed in to change notification settings - Fork 580
[flaky-ci] Retry MAUI restore during feed publication lag #12713
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.
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
Open
simonrozsival
wants to merge
5
commits into
main
Choose a base branch
from
simonrozsival-maui-restore-publication-lag
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
bd0357d
[ci] Retry MAUI restore during feed publication lag
simonrozsival 4bd949e
[ci] Handle leaf-only MAUI restore binlog paths
simonrozsival 5dc2945
Merge origin/main into MAUI restore retry
simonrozsival 2c0bdfc
[ci] Remove MAUI restore pipeline self-tests
simonrozsival 9db99ad
[ci] Validate MAUI restore inputs
simonrozsival File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Some comments aren't visible on the classic Files Changed page.
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,197 @@ | ||
| [CmdletBinding()] | ||
| param ( | ||
| [Parameter(Mandatory)] | ||
| [ValidateNotNullOrEmpty()] | ||
| [string] $DotNetPath, | ||
| [Parameter(Mandatory)] | ||
| [ValidateNotNullOrEmpty()] | ||
| [string] $Project, | ||
| [Parameter(Mandatory)] | ||
| [ValidateNotNullOrEmpty()] | ||
| [string] $NuGetConfig, | ||
| [string] $BinaryLogPath, | ||
| [int] $MaxAttempts = 4, | ||
| [int] $InitialRetryDelaySeconds = 15, | ||
| [int] $MaxRetryDelaySeconds = 60 | ||
| ) | ||
|
|
||
| Set-StrictMode -Version 3.0 | ||
| $ErrorActionPreference = 'Stop' | ||
|
|
||
| function Test-RetryableMauiRestoreFailure | ||
| { | ||
| param ( | ||
| [Parameter(Mandatory)] | ||
| [string] $Output | ||
| ) | ||
|
|
||
| $errorLines = @($Output -split '\r?\n' | Where-Object { $_ -match '(?i)\berror\b' }) | ||
| if ($errorLines.Count -eq 0) { | ||
| return $false | ||
| } | ||
| if ($errorLines | Where-Object { $_ -notmatch '(?i)error NU1102:' }) { | ||
| return $false | ||
| } | ||
|
|
||
| $missingPackageCount = 0 | ||
| $currentPackageHasOlderDotNet11Version = $false | ||
| foreach ($line in $Output -split '\r?\n') { | ||
| if ($line -match '(?i)error NU1102: Unable to find package') { | ||
| if ($missingPackageCount -gt 0 -and -not $currentPackageHasOlderDotNet11Version) { | ||
| return $false | ||
| } | ||
| if ($line -notmatch '(?i)error NU1102: Unable to find package Microsoft\.Extensions\.Logging(?:\.[A-Za-z0-9.-]+)? with version \(>= \d+\.\d+\.\d+-(preview|rc|alpha|beta)(?:\.[0-9A-Za-z-]+)+\)\s*$') { | ||
| return $false | ||
| } | ||
|
|
||
| $missingPackageCount++ | ||
| $currentPackageHasOlderDotNet11Version = $false | ||
| continue | ||
| } | ||
| if ($missingPackageCount -gt 0 -and $line -match '(?i)Found \d+ version\(s\) in dotnet11 \[ Nearest version: \d+\.\d+\.\d+[^]]* \]') { | ||
|
simonrozsival marked this conversation as resolved.
|
||
| $currentPackageHasOlderDotNet11Version = $true | ||
| } | ||
| } | ||
|
|
||
| return $missingPackageCount -gt 0 -and $currentPackageHasOlderDotNet11Version | ||
| } | ||
|
|
||
| function Clear-NuGetHttpCache | ||
| { | ||
| param ( | ||
| [Parameter(Mandatory)] | ||
| [scriptblock] $CommandInvoker | ||
| ) | ||
|
|
||
| $clearResult = & $CommandInvoker @('nuget', 'locals', 'http-cache', '--clear') | ||
| @($clearResult.Output) | ForEach-Object { Write-Host "$_" } | ||
| return [int] $clearResult.ExitCode | ||
| } | ||
|
|
||
| function Invoke-MauiTemplateRestore | ||
| { | ||
| param ( | ||
| [Parameter(Mandatory)] | ||
| [ValidateNotNullOrEmpty()] | ||
| [string] $DotNetPath, | ||
| [Parameter(Mandatory)] | ||
| [ValidateNotNullOrEmpty()] | ||
| [string] $Project, | ||
| [Parameter(Mandatory)] | ||
| [ValidateNotNullOrEmpty()] | ||
| [string] $NuGetConfig, | ||
| [string] $BinaryLogPath, | ||
| [int] $MaxAttempts = 4, | ||
| [int] $InitialRetryDelaySeconds = 15, | ||
| [int] $MaxRetryDelaySeconds = 60, | ||
| [scriptblock] $CommandInvoker, | ||
| [scriptblock] $SleepAction | ||
| ) | ||
|
|
||
| if ($MaxAttempts -lt 1) { | ||
| throw "MaxAttempts must be at least 1." | ||
| } | ||
| if ($InitialRetryDelaySeconds -lt 0) { | ||
| throw "InitialRetryDelaySeconds cannot be negative." | ||
| } | ||
| if ($MaxRetryDelaySeconds -lt $InitialRetryDelaySeconds) { | ||
| throw "MaxRetryDelaySeconds cannot be less than InitialRetryDelaySeconds." | ||
| } | ||
|
|
||
| if ($null -eq $CommandInvoker) { | ||
| $CommandInvoker = { | ||
| param ([string []] $CommandArguments) | ||
|
|
||
| $output = @(& $DotNetPath @CommandArguments 2>&1) | ||
| return [pscustomobject] @{ | ||
| ExitCode = $LASTEXITCODE | ||
| Output = $output | ||
| } | ||
| }.GetNewClosure() | ||
| } | ||
| if ($null -eq $SleepAction) { | ||
| $SleepAction = { | ||
| param ([int] $Seconds) | ||
| Start-Sleep -Seconds $Seconds | ||
| } | ||
| } | ||
|
|
||
| $restoreArguments = @( | ||
| 'restore' | ||
| $Project | ||
| '--configfile' | ||
| $NuGetConfig | ||
| '--no-http-cache' | ||
| '--force-evaluate' | ||
| ) | ||
|
|
||
| $lastExitCode = 1 | ||
| $httpCacheCleared = $false | ||
| for ($attempt = 1; $attempt -le $MaxAttempts; $attempt++) { | ||
| $attemptArguments = @($restoreArguments) | ||
| if ($BinaryLogPath) { | ||
| $binaryLogDirectory = Split-Path -Parent $BinaryLogPath | ||
| if (-not $binaryLogDirectory) { | ||
| $binaryLogDirectory = (Get-Location).Path | ||
| } | ||
| if ($binaryLogDirectory -and -not (Test-Path -LiteralPath $binaryLogDirectory)) { | ||
| New-Item -ItemType Directory -Path $binaryLogDirectory -Force | Out-Null | ||
| } | ||
|
|
||
| $extension = [IO.Path]::GetExtension($BinaryLogPath) | ||
| $fileName = [IO.Path]::GetFileNameWithoutExtension($BinaryLogPath) | ||
| $attemptBinaryLog = Join-Path $binaryLogDirectory "$fileName-attempt-$attempt$extension" | ||
|
simonrozsival marked this conversation as resolved.
|
||
| $attemptArguments += "-bl:$attemptBinaryLog" | ||
| } | ||
|
|
||
| Write-Host "Restoring MAUI template dependencies (attempt $attempt of $MaxAttempts)..." | ||
| $result = & $CommandInvoker $attemptArguments | ||
| $output = @($result.Output) | ||
| $output | ForEach-Object { Write-Host "$_" } | ||
| $lastExitCode = [int] $result.ExitCode | ||
| if ($lastExitCode -eq 0) { | ||
| if (-not $httpCacheCleared) { | ||
| Write-Host "Clearing NuGet's HTTP cache so subsequent MAUI restore graphs cannot reuse stale package metadata." | ||
| $clearExitCode = Clear-NuGetHttpCache -CommandInvoker $CommandInvoker | ||
| if ($clearExitCode -ne 0) { | ||
| Write-Host "NuGet HTTP cache clearing failed with exit code $clearExitCode." | ||
| return $clearExitCode | ||
| } | ||
|
simonrozsival marked this conversation as resolved.
|
||
| } | ||
| return 0 | ||
| } | ||
|
|
||
| $outputText = $output -join [Environment]::NewLine | ||
| if (-not (Test-RetryableMauiRestoreFailure -Output $outputText) -or $attempt -eq $MaxAttempts) { | ||
| return $lastExitCode | ||
| } | ||
| Write-Host "The dotnet11 feed has an older version than the requested prerelease package. Clearing NuGet's HTTP cache before retrying." | ||
| $clearExitCode = Clear-NuGetHttpCache -CommandInvoker $CommandInvoker | ||
| if ($clearExitCode -ne 0) { | ||
| Write-Host "NuGet HTTP cache clearing failed with exit code $clearExitCode." | ||
| return $clearExitCode | ||
| } | ||
| $httpCacheCleared = $true | ||
|
|
||
| $retryDelaySeconds = [Math]::Min( | ||
| $MaxRetryDelaySeconds, | ||
| $InitialRetryDelaySeconds * [Math]::Pow(2, $attempt - 1) | ||
| ) | ||
| Write-Host "Retrying MAUI template restore after $retryDelaySeconds seconds..." | ||
| & $SleepAction ([int] $retryDelaySeconds) | ||
| } | ||
|
|
||
| return $lastExitCode | ||
| } | ||
|
|
||
| $exitCode = Invoke-MauiTemplateRestore ` | ||
| -DotNetPath $DotNetPath ` | ||
| -Project $Project ` | ||
| -NuGetConfig $NuGetConfig ` | ||
| -BinaryLogPath $BinaryLogPath ` | ||
| -MaxAttempts $MaxAttempts ` | ||
| -InitialRetryDelaySeconds $InitialRetryDelaySeconds ` | ||
| -MaxRetryDelaySeconds $MaxRetryDelaySeconds | ||
| if ($exitCode -ne 0) { | ||
| throw "MAUI template restore failed with exit code $exitCode." | ||
| } | ||
21 changes: 21 additions & 0 deletions
21
build-tools/automation/yaml-templates/restore-maui-template.yaml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| parameters: | ||
| project: | ||
| nugetConfig: | ||
| xaSourcePath: | ||
| logsDirectory: | ||
| configuration: $(XA.Build.Configuration) | ||
|
|
||
| steps: | ||
| - powershell: | | ||
| if ([Environment]::OSVersion.Platform -eq "Unix") { | ||
| $dotnetPath = "${{ parameters.xaSourcePath }}/bin/${{ parameters.configuration }}/dotnet/dotnet" | ||
| } else { | ||
| $dotnetPath = "${{ parameters.xaSourcePath }}\bin\${{ parameters.configuration }}\dotnet\dotnet.exe" | ||
| } | ||
|
|
||
| & '${{ parameters.xaSourcePath }}/build-tools/automation/scripts/RestoreMauiTemplate.ps1' ` | ||
| -DotNetPath $dotnetPath ` | ||
| -Project '${{ parameters.project }}' ` | ||
| -NuGetConfig '${{ parameters.nugetConfig }}' ` | ||
| -BinaryLogPath '${{ parameters.logsDirectory }}/MauiTestProj-Restore.binlog' | ||
| displayName: Restore MAUI template dependencies |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🤖⚠️ Testing — This classifier is the safety boundary between retrying a known publication race and masking a real restore failure, but the final change has no checked-in executable coverage for its output grammar. The earlier
RestoreMauiTemplate.Tests.ps1exercised the positive, mixed-error, unrelated-package, persistent-failure, cache-clear, and backoff paths; removing it means the “direct checks” in the PR description cannot catch future regex or control-flow regressions. Please retain focused tests and run them in one appropriate validation lane rather than executing them in every MAUI job.Rule: Preserve regression coverage for retry classification