Fixes #59 Add matrix to config merger logic

ncipollo · Oct 2, 2023 · 2380d75 · 2380d75
1 parent 95d38f0
commit 2380d75
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/commonMain/kotlin/org/tix/config/merge/TixMerger.kt b/src/commonMain/kotlin/org/tix/config/merge/TixMerger.kt
@@ -6,6 +6,7 @@ fun RawTixConfiguration.merge(overlay: RawTixConfiguration) = RawTixConfiguratio
     include = overlay.include,// We always want to take the top include
     github = github?.merge(overlay.github) ?: overlay.github,
     jira = jira?.merge(overlay.jira) ?: overlay.jira,
+    matrix = matrix + overlay.matrix,
     variables = variables + overlay.variables,
     variableToken = overlay.variableToken ?: variableToken
 )

diff --git a/src/commonTest/kotlin/org/tix/config/merge/TixMergerTest.kt b/src/commonTest/kotlin/org/tix/config/merge/TixMergerTest.kt
@@ -19,6 +19,7 @@ class TixMergerTest {
                     default = mapOf("jira$index" to DynamicElement(index))
                 )
             ).takeIf { index < 3 },
+            matrix = mapOf("matrix_$index" to listOf(DynamicElement("value_$index"))),
             variables = mapOf("config$index" to "$index"),
             variableToken = "$index"
         )
@@ -44,6 +45,11 @@ class TixMergerTest {
                     )
                 )
             ),
+            matrix = mapOf(
+                "matrix_1" to listOf(DynamicElement("value_1")),
+                "matrix_2" to listOf(DynamicElement("value_2")),
+                "matrix_3" to listOf(DynamicElement("value_3"))
+            ),
             variables = mapOf(
                 "config1" to "1",
                 "config2" to "2",