From ecbb5cad711e946eef458a181b02b75b2c97ad82 Mon Sep 17 00:00:00 2001
From: Kareem Farid <kareefardi@users.noreply.github.com>
Date: Tue, 16 Apr 2024 17:48:07 +0200
Subject: [PATCH] Fix test matrix

---
 .github/scripts/get_tests_matrix_alt.py | 10 +++-------
 .github/workflows/action.yaml           |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/.github/scripts/get_tests_matrix_alt.py b/.github/scripts/get_tests_matrix_alt.py
index c4a493d..f5b9def 100644
--- a/.github/scripts/get_tests_matrix_alt.py
+++ b/.github/scripts/get_tests_matrix_alt.py
@@ -4,20 +4,16 @@
 
 def main():
     test_set_yaml = ".github/test_set.yaml"
-    output_matrix = {}
+    output_matrix = {"tests": []}
     test_set_stream = open(test_set_yaml)
     data = yaml.load(test_set_stream, Loader=yaml.Loader)
     for item in data:
         tests = item["tests"]
         name = item["name"]
-        if output_matrix.get(name) is None:
-            output_matrix[name] = {"test-names": []}
         url = item["url"]
-        output_matrix[name]["url"] = url
-        for test in tests:
-            output_matrix[name]["test-names"].append(test)
+        output_matrix["tests"].append({"name": name, "url": url, "test-names": tests})
 
-    print(json.dumps(output_matrix), end="")
+    print(json.dumps(output_matrix))
     test_set_stream.close()
 
 
diff --git a/.github/workflows/action.yaml b/.github/workflows/action.yaml
index 7673b9f..9b88520 100644
--- a/.github/workflows/action.yaml
+++ b/.github/workflows/action.yaml
@@ -46,6 +46,6 @@ jobs:
     name: Run Test (Separate workflow)
     uses: ./.github/workflows/run_test.yaml
     with:
-      url: ${{ matrix.url }}
-      test-names: ${{ matrix.test-names }}
-      name: ${{ matrix.name }}
+      url: ${{ matrix.tests.url }}
+      test-names: ${{ matrix.tests.test-names }}
+      name: ${{ matrix.tests.name }}