Skip to content

Commit

Permalink
Sync eng/common directory with azure-sdk-tools for PR 1353 (Azure#16465)
Browse files Browse the repository at this point in the history
* Use a helper function to normalize the package name for readme

* Get the readme name from artifact-metadata-parsing

* Change to the readme

* Update eng/common/scripts/artifact-metadata-parsing.ps1

Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>

Co-authored-by: Sima Zhu <sizhu@microsoft.com>
Co-authored-by: Sima Zhu <48036328+sima-zhu@users.noreply.github.com>
Co-authored-by: Wes Haggard <weshaggard@users.noreply.github.com>
  • Loading branch information
4 people authored Feb 2, 2021
1 parent 22921fd commit e1cce3e
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
6 changes: 5 additions & 1 deletion eng/common/scripts/artifact-metadata-parsing.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -123,14 +123,18 @@ function VerifyPackages($artifactLocation, $workingDirectory, $apiUrl, $releaseS
Write-Host "Maybe a pkg version wasn't updated properly?"
exit(1)
}

$docsReadMeName = $parsedPackage.PackageId
if ($parsedPackage.DocsReadMeName) {
$docsReadMeName = $parsedPackage.DocsReadMeName
}
$pkgList += New-Object PSObject -Property @{
PackageId = $parsedPackage.PackageId
PackageVersion = $parsedPackage.PackageVersion
GroupId = $parsedPackage.GroupId
Tag = $parsedPackage.ReleaseTag
ReleaseNotes = $parsedPackage.ReleaseNotes
ReadmeContent = $parsedPackage.ReadmeContent
DocsReadMeName = $docsReadMeName
IsPrerelease = [AzureEngSemanticVersion]::ParseVersionString($parsedPackage.PackageVersion).IsPrerelease
}
}
Expand Down
2 changes: 1 addition & 1 deletion eng/common/scripts/update-docs-metadata.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ foreach ($config in $targets) {
Write-Host ($pkgsFiltered | % { $_.PackageId + " " + $_.PackageVersion })

foreach ($packageInfo in $pkgsFiltered) {
$readmeName = "$($packageInfo.PackageId.Replace('azure-','').Replace('Azure.', '').Replace('@azure/', '').ToLower())-readme${suffix}.md"
$readmeName = "$($packageInfo.DocsReadMeName.ToLower())-readme${suffix}.md"
$readmeFolder = Join-Path $DocRepoLocation $config.content_folder
$readmeLocation = Join-Path $readmeFolder $readmeName

Expand Down

0 comments on commit e1cce3e

Please sign in to comment.