Skip to content

Ensure assets resolution script handles special-case file paths #8831

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
merged 2 commits into from
Aug 15, 2024
Merged

Ensure assets resolution script handles special-case file paths #8831

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
abbe33d
we want the path that we write to to be defined by literalpath, other…
scbedd Aug 13, 2024
9fdc167
slight wording adjustment so the command can be invoked directly
scbedd Aug 14, 2024
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
10 changes: 5 additions & 5 deletions eng/common/testproxy/scripts/tag-merge/merge-proxy-tags.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,10 +111,10 @@ function Locate-Assets-Slice($ProxyExe, $AssetsJson, $MountDirectory) {

function Get-Tag-SHA($TagName, $WorkingDirectory) {
$results = Git-Command "ls-remote origin $TagName" $WorkingDirectory

if ($results -and $lastexitcode -eq 0) {
$arr = $results -split '\s+'

return $arr[0]
}

Expand All @@ -124,7 +124,7 @@ function Get-Tag-SHA($TagName, $WorkingDirectory) {

function Start-Message($AssetsJson, $TargetTags, $AssetsRepoLocation, $MountDirectory) {
$alreadyCombinedTags = Load-Incomplete-Progress $MountDirectory

$TargetTags = $TargetTags | Where-Object { $_ -notin $alreadyCombinedTags }

if ($alreadyCombinedTags) {
Expand Down Expand Up @@ -172,7 +172,7 @@ function Finish-Message($AssetsJson, $TargetTags, $AssetsRepoLocation, $MountDir

$suffix = if ($len -gt 1) { "s" } else { "" }

Write-Host "`nSuccessfully combined $len tag$suffix. Invoke `"test-proxy push " -NoNewLine
Write-Host "`nSuccessfully combined $len tag$suffix. Invoke `"test-proxy push -a " -NoNewLine
Write-Host $AssetsJson -ForegroundColor Green -NoNewLine
Write-Host "`" to push the results as a new tag."
}
Expand Down Expand Up @@ -256,7 +256,7 @@ function Combine-Tags($RemainingTags, $AssetsRepoLocation, $MountDirectory, $Rel
$pushedTags = Load-Incomplete-Progress $MountDirectory

$testFile = Get-ChildItem -Recurse -Path $AssetsRepoLocation | Where-Object { !$_.PSIsContainer } | Select-Object -First 1
Add-Content -Path $testFile -Value "`n"
Add-Content -LiteralPath $testFile -Value "`n"

# if we have successfully gotten to the end without any non-zero exit codes...delete the mergeprogress file, we're g2g
Cleanup-Incomplete-Progress $MountDirectory
Expand Down