Another fix of the matrix

Author: build-failure

.github/workflows/sync-base-images.yml

@@ -38,8 +38,9 @@ jobs:
             exit 1
           fi
           echo "Matrix JSON length: ${#json} chars (output written to GITHUB_OUTPUT)"
-          # Single-line matrix required: GITHUB_OUTPUT is newline-delimited and fromJson() needs valid JSON
-          printf 'matrix=%s\n' "${json//%/%25}" >> "$GITHUB_OUTPUT"
+          # strategy.matrix must be an object; use include: [...] for explicit list of jobs
+          matrix_json="{\"include\":${json}}"
+          printf 'matrix=%s\n' "${matrix_json//%/%25}" >> "$GITHUB_OUTPUT"
           images=$(yq -r '.images | keys | .[]' config/images.yaml | sort -u)
           echo "names<<NAMES_EOF" >> "$GITHUB_OUTPUT"
           echo "$images" >> "$GITHUB_OUTPUT"

test/scripts/test-prepare.sh

@@ -31,14 +31,16 @@ fi
 echo "Matrix JSON length: ${#json} chars"
 
 # Build GITHUB_OUTPUT-style file (same as in workflow)
+# strategy.matrix must be an object; use include: [...] for explicit list of jobs
+matrix_json="{\"include\":${json}}"
 if [ "$OUTPUT_FILE" = "-" ]; then
   TARGET="/dev/stdout"
 else
   TARGET="$OUTPUT_FILE"
   : > "$TARGET"
 fi
 
-printf 'matrix=%s\n' "${json//%/%25}" >> "$TARGET"
+printf 'matrix=%s\n' "${matrix_json//%/%25}" >> "$TARGET"
 images=$(yq -r '.images | keys | .[]' config/images.yaml | sort -u)
 echo "names<<NAMES_EOF" >> "$TARGET"
 echo "$images" >> "$TARGET"
@@ -50,15 +52,15 @@ fi
 
 # Validate: simulate fromJson() on matrix (requires jq)
 if command -v jq &>/dev/null; then
-  if echo "$json" | jq -e . >/dev/null 2>&1; then
-    count=$(echo "$json" | jq 'length')
-    echo "Valid JSON matrix: $count entries (fromJson would succeed)"
+  if echo "$matrix_json" | jq -e '.include | length' >/dev/null 2>&1; then
+    count=$(echo "$matrix_json" | jq '.include | length')
+    echo "Valid matrix (include: $count entries); fromJson would succeed"
     echo "First 3 entries:"
-    echo "$json" | jq -c '.[:3][]'
+    echo "$matrix_json" | jq -c '.include[:3][]'
   else
-    echo "WARNING: matrix value is not valid JSON (fromJson would fail)" >&2
-    echo "Raw (first 120 chars): ${json:0:120}..." >&2
+    echo "WARNING: matrix value is not valid for strategy.matrix (fromJson would fail)" >&2
+    echo "Raw (first 120 chars): ${matrix_json:0:120}..." >&2
   fi
 else
-  echo "Tip: install jq to validate that the matrix is valid JSON for fromJson()"
+  echo "Tip: install jq to validate that the matrix is valid for fromJson()"
 fi