Skip to content
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

Create-PrJobMatrix #9281

Merged
merged 8 commits into from
Oct 30, 2024
Merged

Create-PrJobMatrix #9281

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
df964c2
this is working in js and python. transferring configuration
scbedd Oct 30, 2024
a5bee82
code comment cleanup
scbedd Oct 30, 2024
1233b87
we now pass the combined MatrixConfigs through to the Create-PRJobMat…
scbedd Oct 30, 2024
67b3f3c
re-add comment
scbedd Oct 30, 2024
ef0b314
remove mandatory output message when GetValuesafelyFrom-Yaml doesn't …
scbedd Oct 30, 2024
833d52f
remove useless ForEach-Object { [PSCustomObject] }
scbedd Oct 30, 2024
2c03fac
CIMatrixConfig null coalesce operator. Add the property CIMatrixConfigs
scbedd Oct 30, 2024
0330bac
handle additional matrix config list
scbedd Oct 30, 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
1 change: 1 addition & 0 deletions eng/common/scripts/Package-Properties.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ class PackageProps
# additional packages required for validation of this one
[string[]]$AdditionalValidationPackages
[HashTable]$ArtifactDetails
[HashTable[]]$CIMatrixConfigs

PackageProps([string]$name, [string]$version, [string]$directoryPath, [string]$serviceDirectory)
{
Expand Down
4 changes: 1 addition & 3 deletions eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,7 @@ $packageProperties = Get-ChildItem -Recurse "$PackagePropertiesFolder" *.json `

# set default matrix config for each package if there isn't an override
$packageProperties | ForEach-Object {
if (-not $_.CIMatrixConfigs) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I blindly took this and it definitely doesn't work. It's because CIMatrixConfigs isn't null, it's Empty Array.

$_.CIMatrixConfigs = $configs
}
$_.CIMatrixConfigs = $_.CIMatrixConfigs ?? $configs
}

# The key here is that after we group the packages by the matrix config objects, we can use the first item's MatrixConfig
Expand Down