Skip to content

Commit 1d05d3f

Browse files
committed
make this easier for the rust config
1 parent 2eaf22b commit 1d05d3f

2 files changed

Lines changed: 19 additions & 7 deletions

File tree

eng/common/scripts/Package-Properties.ps1

Lines changed: 17 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class PackageProps
1515
[boolean]$IsNewSdk
1616
[string]$ArtifactName
1717
[string]$ReleaseStatus
18-
[string[]]$DependentPackages
18+
[string[]]$CanaryPackages
1919

2020
PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory)
2121
{
@@ -129,19 +129,30 @@ function Get-PrPkgProperties([string]$InputDiffJson) {
129129
if ($shouldInclude) {
130130
$packagesWithChanges += $pkg
131131

132-
if ($pkg.DependentPackages) {
133-
$dependentPackagesForInclusion += $pkg.DependentPackages
132+
if ($pkg.CanaryPackages) {
133+
$dependentPackagesForInclusion += $pkg.CanaryPackages
134134
}
135135
}
136136
}
137137
}
138138

139-
foreach ($addition in $dependentPackagesForInclusion) {
140-
if ($lookup[$addition]) {
141-
$packagesWithChanges += $lookup[$addition]
139+
# there is a custom function to get dependent packages from a changed package set and diff
140+
if ($DependentPackagesFromPackageSetFn -and (Test-Path "Function:$DependentPackagesFromPackageSetFn"))
141+
{
142+
$packagesWithChanges += &$DependentPackagesFromPackageSetFn $packagesWithChanges $diff
143+
}
144+
else {
145+
foreach ($addition in $dependentPackagesForInclusion) {
146+
$key = $addition.Replace($RepoRoot, "").SubString(1)
147+
148+
if ($lookup[$key]) {
149+
$packagesWithChanges += $lookup[$key]
150+
}
142151
}
143152
}
144153

154+
155+
145156
return $packagesWithChanges
146157
}
147158

eng/common/scripts/common.ps1

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ $GetEmitterAdditionalOptionsFn = "Get-${Language}-EmitterAdditionalOptions"
6262
$GetEmitterNameFn = "Get-${Language}-EmitterName"
6363
$GetDirectoriesForGenerationFn = "Get-${Language}-DirectoriesForGeneration"
6464
$UpdateGeneratedSdksFn = "Update-${Language}-GeneratedSdks"
65-
$IsApiviewStatusCheckRequiredFn = "Get-${Language}-ApiviewStatusCheckRequirement"
65+
$IsApiviewStatusCheckRequiredFn = "Get-${Language}-ApiviewStatusCheckRequirement"
66+
$DependentPackagesFromPackageSetFn = "Get-${Language}-DependentPackagesFromPackageSet"
6667

6768
# Expected to be set in eng/scripts/docs/Docs-Onboarding.ps1
6869
$SetDocsPackageOnboarding = "Set-${Language}-DocsPackageOnboarding"

0 commit comments

Comments
 (0)