github/azure-sdk-for-cpp
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Pass non sparse parameters through to PR job matrix generator (#6386)

Browse Source 
Co-authored-by: Ben Broderick Phillips <bebroder@microsoft.com>
This commit is contained in:
Azure SDK Bot 2025-02-04 10:32:17 -08:00 committed by GitHub
parent e0c5f27d6b
commit 494f9ff858
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1
View File

@ -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) {
@ -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: "
@ -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: "

8
eng/common/scripts/job-matrix/job-matrix-functions.ps1
View File

@ -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
@ -761,7 +762,8 @@ function GenerateMatrixForConfig {
-selectFromMatrixType $Selection `
-displayNameFilter $DisplayNameFilter `
-filters $Filters `
-replace $Replace
-replace $Replace `
-nonSparseParameters $NonSparseParameters
return , $matrix
}