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

Sync eng/common directory with azure-sdk-tools for PR 9747 #1792

Merged
merged 1 commit into from
Feb 4, 2025
Merged

Sync eng/common directory with azure-sdk-tools for PR 9747 #1792

Show file tree
Hide file tree
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
7 changes: 5 additions & 2 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 @@ -100,6 +100,7 @@ function GeneratePRMatrixForBatch {
$matrixResults = @()
foreach ($matrixConfig in $matrixConfigs) {
Write-Host "Generating config for $($matrixConfig.Path)"
$nonSparse = $matrixConfig.PSObject.Properties['NonSparseParameters'] ? $matrixConfig.NonSparseParameters : @()

$matrixResults = @()
if ($directBatch) {
Expand All @@ -108,7 +109,8 @@ function GeneratePRMatrixForBatch {
-Selection $matrixConfig.Selection `
-DisplayNameFilter $DisplayNameFilter `
-Filters $Filters `
-Replace $Replace
-Replace $Replace `
-NonSparseParameters $nonSparse

if ($matrixResults) {
Write-Host "We have the following direct matrix results: "
Expand All @@ -121,7 +123,8 @@ function GeneratePRMatrixForBatch {
-Selection $matrixConfig.Selection `
-DisplayNameFilter $DisplayNameFilter `
-Filters ($Filters + $IndirectFilters) `
-Replace $Replace
-Replace $Replace `
-NonSparseParameters $nonSparse

if ($matrixResults) {
Write-Host "We have the following indirect matrix results: "
Expand Down
8 changes: 5 additions & 3 deletions eng/common/scripts/job-matrix/job-matrix-functions.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,10 +743,11 @@ function Get4dMatrixIndex([int]$index, [Array]$dimensions) {
function GenerateMatrixForConfig {
param (
[Parameter(Mandatory = $true)][string] $ConfigPath,
[Parameter(Mandatory = $True)][string] $Selection,
[Parameter(Mandatory = $true)][string] $Selection,
[Parameter(Mandatory = $false)][string] $DisplayNameFilter,
[Parameter(Mandatory = $false)][array] $Filters,
[Parameter(Mandatory = $false)][array] $Replace
[Parameter(Mandatory = $false)][array] $Replace,
[Parameter(Mandatory = $false)][Array] $NonSparseParameters = @()
)
$matrixFile = Join-Path $PSScriptRoot ".." ".." ".." ".." $ConfigPath

Expand All @@ -761,7 +762,8 @@ function GenerateMatrixForConfig {
-selectFromMatrixType $Selection `
-displayNameFilter $DisplayNameFilter `
-filters $Filters `
-replace $Replace
-replace $Replace `
-nonSparseParameters $NonSparseParameters

return , $matrix
}