Skip to content

Sync eng/common directory with azure-sdk-tools for PR 7682 #5381

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
azure-sdk merged 4 commits into from
Feb 29, 2024
Merged

Sync eng/common directory with azure-sdk-tools for PR 7682 #5381

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
06b5586
Support resolving environment variable references in matrix config
benbp Feb 14, 2024
f75bc10
Improve type and null handling
benbp Feb 14, 2024
f70ad4f
Fix reference bug
benbp Feb 15, 2024
6cfaab9
Change behavior on missing env vars to throw
benbp Feb 15, 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
Improve type and null handling
  • Loading branch information
@benbp @azure-sdk
benbp authored and azure-sdk committed Feb 15, 2024
commit f75bc10b04a6f45fddc3eb3722e276561ba4ee54
10 changes: 8 additions & 2 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 @@ -76,7 +76,7 @@ class MatrixParameter {
$displayName = $this.Value.ToString()
}

if ($displayNamesLookup.ContainsKey($displayName)) {
if ($displayNamesLookup -and $displayNamesLookup.ContainsKey($displayName)) {
$displayName = $displayNamesLookup[$displayName]
}

Expand Down Expand Up @@ -339,6 +339,9 @@ function ProcessReplace {

foreach ($element in $matrix) {
$replacement = [MatrixParameter[]]@()
if (!$element -or $element.Count -eq 0) {
continue
}

foreach ($perm in $element._permutation) {
$replace = $perm
Expand Down Expand Up @@ -372,11 +375,14 @@ function ProcessEnvironmentVariableReferences([array]$matrix, $displayNamesLooku

foreach ($element in $matrix) {
$updated = [MatrixParameter[]]@()
if (!$element -or $element.Count -eq 0) {
continue
}

foreach ($perm in $element._permutation) {
# Iterate nested permutations or run once for singular values (int, string, bool)
foreach ($flattened in $perm.Flatten()) {
if ($flattened.Value?.GetType() -eq "".GetType() -and $flattened.Value.StartsWith("env:")) {
if ($flattened.Value -is [string] -and $flattened.Value.StartsWith("env:")) {
$envKey = $flattened.Value.Replace("env:", "")
$value = [System.Environment]::GetEnvironmentVariable($envKey) ?? ""
if (!$value) {
Expand Down