Merge branch 'ci/fixes'

Author: lucasssvaz

.github/workflows/tests_hw_wokwi.yml

@@ -123,13 +123,13 @@ jobs:
             push_time=""
           fi
 
-          hw_targets=$(jq -r '.hw_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
-          hw_types=$(jq -r '.hw_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
-          wokwi_targets=$(jq -r '.wokwi_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
-          wokwi_types=$(jq -r '.wokwi_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
+          hw_targets=$(jq -c '.hw_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
+          hw_types=$(jq -c '.hw_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
+          wokwi_targets=$(jq -c '.wokwi_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
+          wokwi_types=$(jq -c '.wokwi_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
           qemu_tests_enabled=$(jq -r '.qemu_tests_enabled' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:]")
-          qemu_targets=$(jq -r '.qemu_targets | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
-          qemu_types=$(jq -r '.qemu_types | tostring' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
+          qemu_targets=$(jq -c '.qemu_targets' artifacts/matrix_info/test_matrix.json | tr -cd "[:alnum:],[]\"")
+          qemu_types=$(jq -c '.qemu_types' artifacts/matrix_info/test_matrix.json | tr -cd "[:alpha:],[]\"")
 
           echo "base = $base"
           echo "hw_targets = $hw_targets"
@@ -149,15 +149,15 @@ jobs:
           # Create a single JSON file with all workflow run information
           cat > artifacts/workflow_info.json <<EOF
           {
-            "hw_tests_enabled": "$hw_tests_enabled",
-            "hw_targets": "$hw_targets",
-            "hw_types": "$hw_types",
-            "wokwi_tests_enabled": "$wokwi_tests_enabled",
-            "wokwi_targets": "$wokwi_targets",
-            "wokwi_types": "$wokwi_types",
-            "qemu_tests_enabled": "$qemu_tests_enabled",
-            "qemu_targets": "$qemu_targets",
-            "qemu_types": "$qemu_types",
+            "hw_tests_enabled": $hw_tests_enabled,
+            "hw_targets": $hw_targets,
+            "hw_types": $hw_types,
+            "wokwi_tests_enabled": $wokwi_tests_enabled,
+            "wokwi_targets": $wokwi_targets,
+            "wokwi_types": $wokwi_types,
+            "qemu_tests_enabled": $qemu_tests_enabled,
+            "qemu_targets": $qemu_targets,
+            "qemu_types": $qemu_types,
             "ref": "$ref",
             "event": "${{ github.event.workflow_run.event }}",
             "sha": "${{ github.event.workflow_run.head_sha || github.sha }}",