Set os by default in test matrix

swissspidy · swissspidy · commit 037b26c5e94f · 2026-03-30T15:12:11.000+02:00
diff --git a/.github/workflows/reusable-testing.yml b/.github/workflows/reusable-testing.yml
@@ -323,7 +323,7 @@ jobs:
         }
         EOF
         )
-        MERGED_MATRIX=$(echo "$MATRIX" "$ADDITIONAL_MATRIX" | jq -s '{include: (.[0].include + .[1].include | unique), exclude: (.[0].exclude + .[1].exclude | unique)}')
+        MERGED_MATRIX=$(echo "$MATRIX" "$ADDITIONAL_MATRIX" | jq -s '{include: (.[0].include + .[1].include | map(if .os == null then .os = "" else . end) | unique), exclude: (.[0].exclude + .[1].exclude | unique)}')
         echo matrix=$MERGED_MATRIX >> $GITHUB_OUTPUT
 
   prepare-unit:

Original file line number	Diff line number	Diff line change
`@@ -323,7 +323,7 @@ jobs:`
`323`	`323`	`}`
`324`	`324`	`EOF`
`325`	`325`	`)`
`326`		`- MERGED_MATRIX=$(echo "$MATRIX" "$ADDITIONAL_MATRIX" \| jq -s '{include: (.[0].include + .[1].include \| unique), exclude: (.[0].exclude + .[1].exclude \| unique)}')`
	`326`	`+ MERGED_MATRIX=$(echo "$MATRIX" "$ADDITIONAL_MATRIX" \| jq -s '{include: (.[0].include + .[1].include \| map(if .os == null then .os = "" else . end) \| unique), exclude: (.[0].exclude + .[1].exclude \| unique)}')`
`327`	`327`	`echo matrix=$MERGED_MATRIX >> $GITHUB_OUTPUT`
`328`	`328`
`329`	`329`	`prepare-unit:`