Skip to content

Commit 1887ff6

Browse files
azure-sdkbenbp
andauthored
Pass non sparse parameters through to PR job matrix generator (Azure#2054)
Co-authored-by: Ben Broderick Phillips <[email protected]>
1 parent 06cf2f1 commit 1887ff6

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

eng/common/scripts/job-matrix/Create-PrJobMatrix.ps1

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ function GeneratePRMatrixForBatch {
100100
$matrixResults = @()
101101
foreach ($matrixConfig in $matrixConfigs) {
102102
Write-Host "Generating config for $($matrixConfig.Path)"
103+
$nonSparse = $matrixConfig.PSObject.Properties['NonSparseParameters'] ? $matrixConfig.NonSparseParameters : @()
103104

104105
$matrixResults = @()
105106
if ($directBatch) {
@@ -108,7 +109,8 @@ function GeneratePRMatrixForBatch {
108109
-Selection $matrixConfig.Selection `
109110
-DisplayNameFilter $DisplayNameFilter `
110111
-Filters $Filters `
111-
-Replace $Replace
112+
-Replace $Replace `
113+
-NonSparseParameters $nonSparse
112114

113115
if ($matrixResults) {
114116
Write-Host "We have the following direct matrix results: "
@@ -121,7 +123,8 @@ function GeneratePRMatrixForBatch {
121123
-Selection $matrixConfig.Selection `
122124
-DisplayNameFilter $DisplayNameFilter `
123125
-Filters ($Filters + $IndirectFilters) `
124-
-Replace $Replace
126+
-Replace $Replace `
127+
-NonSparseParameters $nonSparse
125128

126129
if ($matrixResults) {
127130
Write-Host "We have the following indirect matrix results: "

eng/common/scripts/job-matrix/job-matrix-functions.ps1

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -743,10 +743,11 @@ function Get4dMatrixIndex([int]$index, [Array]$dimensions) {
743743
function GenerateMatrixForConfig {
744744
param (
745745
[Parameter(Mandatory = $true)][string] $ConfigPath,
746-
[Parameter(Mandatory = $True)][string] $Selection,
746+
[Parameter(Mandatory = $true)][string] $Selection,
747747
[Parameter(Mandatory = $false)][string] $DisplayNameFilter,
748748
[Parameter(Mandatory = $false)][array] $Filters,
749-
[Parameter(Mandatory = $false)][array] $Replace
749+
[Parameter(Mandatory = $false)][array] $Replace,
750+
[Parameter(Mandatory = $false)][Array] $NonSparseParameters = @()
750751
)
751752
$matrixFile = Join-Path $PSScriptRoot ".." ".." ".." ".." $ConfigPath
752753

@@ -761,7 +762,8 @@ function GenerateMatrixForConfig {
761762
-selectFromMatrixType $Selection `
762763
-displayNameFilter $DisplayNameFilter `
763764
-filters $Filters `
764-
-replace $Replace
765+
-replace $Replace `
766+
-nonSparseParameters $NonSparseParameters
765767

766768
return , $matrix
767769
}

0 commit comments

Comments
 (0)