Skip to content

Taking the parameters literally #22047

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
sima-zhu merged 1 commit into from
Dec 8, 2021
Merged

Taking the parameters literally #22047

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
16 changes: 10 additions & 6 deletions eng/scripts/Language-Settings.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,7 +288,7 @@ $PackageExclusions = @{
'azure-mgmt-network' = 'Manual process used to build';
}

function Update-python-DocsMsPackages($DocsRepoLocation, $DocsMetadata) {
function Update-python-DocsMsPackages($DocsRepoLocation, $DocsMetadata, $PackageSourceOverride, $DocValidationImageId) {
Write-Host "Excluded packages:"
foreach ($excludedPackage in $PackageExclusions.Keys) {
Write-Host " $excludedPackage - $($PackageExclusions[$excludedPackage])"
Expand All @@ -299,15 +299,19 @@ function Update-python-DocsMsPackages($DocsRepoLocation, $DocsMetadata) {
UpdateDocsMsPackages `
(Join-Path $DocsRepoLocation 'ci-configs/packages-preview.json') `
'preview' `
$FilteredMetadata
$FilteredMetadata `
$PackageSourceOverride `
$DocValidationImageId

UpdateDocsMsPackages `
(Join-Path $DocsRepoLocation 'ci-configs/packages-latest.json') `
'latest' `
$FilteredMetadata
$FilteredMetadata `
$PackageSourceOverride `
$DocValidationImageId
}

function UpdateDocsMsPackages($DocConfigFile, $Mode, $DocsMetadata) {
function UpdateDocsMsPackages($DocConfigFile, $Mode, $DocsMetadata, $PackageSourceOverride, $DocValidationImageId) {
Write-Host "Updating configuration: $DocConfigFile with mode: $Mode"
$packageConfig = Get-Content $DocConfigFile -Raw | ConvertFrom-Json

Expand Down Expand Up @@ -370,7 +374,7 @@ function UpdateDocsMsPackages($DocConfigFile, $Mode, $DocsMetadata) {
# If upgrading the package, run basic sanity checks against the package
if ($package.package_info.version -ne $packageVersion) {
Write-Host "New version detected for $packageName ($packageVersion)"
if (!(ValidatePackage -packageName $packageName -packageVersion $packageVersion)) {
if (!(ValidatePackage -packageName $packageName -packageVersion $packageVersion -PackageSourceOverride $PackageSourceOverride -DocValidationImageId $DocValidationImageId)) {
LogWarning "Package is not valid: $packageName. Keeping old version."
$outputPackages += $package
continue
Expand Down Expand Up @@ -425,7 +429,7 @@ function UpdateDocsMsPackages($DocConfigFile, $Mode, $DocsMetadata) {
if ($Mode -eq 'preview') {
$packageVersion = "==$($package.VersionPreview)"
}
if (!(ValidatePackage -packageName $packageName -packageVersion $packageVersion)) {
if (!(ValidatePackage -packageName $packageName -packageVersion $packageVersion -PackageSourceOverride $PackageSourceOverride -DocValidationImageId $DocValidationImageId)) {
LogWarning "Package is not valid: $packageName. Cannot onboard."
continue
}
Expand Down