Skip to content

Sync eng/common directory with azure-sdk-tools for PR 9281 #46917

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
scbedd merged 8 commits into from
Oct 30, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 9281 #46917

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
1c64737
this is working in js and python. transferring configuration
scbedd Oct 30, 2024
bff3453
code comment cleanup
scbedd Oct 30, 2024
7fd7f7d
we now pass the combined MatrixConfigs through to the Create-PRJobMat…
scbedd Oct 30, 2024
12b4428
re-add comment
scbedd Oct 30, 2024
5f1c9a8
remove mandatory output message when GetValuesafelyFrom-Yaml doesn't …
scbedd Oct 30, 2024
25e38ff
remove useless ForEach-Object { [PSCustomObject] }
scbedd Oct 30, 2024
f8dfcde
CIMatrixConfig null coalesce operator. Add the property CIMatrixConfigs
scbedd Oct 30, 2024
641433d
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
Prev Previous commit
Next Next commit
CIMatrixConfig null coalesce operator. Add the property CIMatrixConfigs
  • Loading branch information
@scbedd @azure-sdk
scbedd authored and azure-sdk committed Oct 30, 2024
commit f8dfcde2894d7fa8b1d4f6ccdaa329d9ee912616
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) {
$_.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