github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Sync eng/common directory with azure-sdk-tools for PR 6518 (#4803)

Browse Source 
* Bump test proxy version
* move proxy transition-scripts folder to onboarding

Co-authored-by: Bill Wert <billwert@microsoft.com>
Co-authored-by: Scott Beddall <scbedd@microsoft.com>
This commit is contained in:
Azure SDK Bot 2023-07-28 15:01:28 -07:00 committed by GitHub
parent db328891d5
commit 6ad42e1e40
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
eng/common/testproxy/transition-scripts/README.md → eng/common/testproxy/onboarding/README.me
View File

13
eng/common/testproxy/transition-scripts/generate-assets-json.ps1 → eng/common/testproxy/onboarding/generate-assets-json.ps1
View File

@ -308,18 +308,17 @@ Function Invoke-ProxyCommand {
# Get the shorthash directory under PROXY_ASSETS_FOLDER
Function Get-AssetsRoot {
param(
[string] $AssetsJsonFile
[string] $AssetsJsonFile,
[string] $TestProxyExe
)
$repoRoot = Get-Repo-Root
$relPath = [IO.Path]::GetRelativePath($repoRoot, $AssetsJsonFile).Replace("`\", "/")
$assetsJsonDirectory = Split-Path $relPath
$breadcrumbFile = Join-Path $repoRoot ".assets" ".breadcrumb"
$breadcrumbString = Get-Content $breadcrumbFile | Where-Object { $_.StartsWith($relPath) }
$assetRepo = $breadcrumbString.Split(";")[1]
$assetsPrefix = (Get-Content $AssetsJsonFile | Out-String | ConvertFrom-Json).AssetsRepoPrefixPath
[array] $output = & "$TestProxyExe" config locate -a "$relPath" --storage-location="$repoRoot"
$assetsDirectory = $output[-1]
return Join-Path $repoRoot ".assets" $assetRepo $assetsPrefix $assetsJsonDirectory
return Join-Path $assetsDirectory $assetsJsonDirectory
}
Function Move-AssetsFromLangRepo {
@ -405,7 +404,7 @@ if ($InitialPush) {
$CommandArgs = "restore --assets-json-path $assetsJsonRelPath"
Invoke-ProxyCommand -TestProxyExe $TestProxyExe -CommandArgs $CommandArgs -TargetDirectory $repoRoot
$assetsRoot = (Get-AssetsRoot -AssetsJsonFile $assetsJsonFile)
$assetsRoot = (Get-AssetsRoot -AssetsJsonFile $assetsJsonFile -TestProxyExe $TestProxyExe)
Write-Host "assetsRoot=$assetsRoot"
Move-AssetsFromLangRepo -AssetsRoot $assetsRoot

2
eng/common/testproxy/target_version.txt
View File

@ -1 +1 @@
1.0.0-dev.20230706.1
1.0.0-dev.20230728.1