update

Author: tgross35

ci/ci-util.py

@@ -213,7 +213,7 @@ def can_skip_libm_ci(self) -> bool:
 
         return False
 
-    def make_workflow_output(self) -> str:
+    def emit_workflow_output(self):
         """Create a JSON object a list items for each type's changed files, if any
         did change, and the routines that were affected by the change.
         """
@@ -233,7 +233,7 @@ def make_workflow_output(self) -> str:
                 eprint("Skipping all extensive tests")
 
         changed = self.changed_routines()
-        extensive_matrix = []
+        matrix = []
         total_to_test = 0
 
         # Figure out which extensive tests need to run
@@ -248,14 +248,14 @@ def make_workflow_output(self) -> str:
                 "to_test": ",".join(ty_to_test),
             }
 
-            extensive_matrix.append(item)
+            matrix.append(item)
 
-        ret = {
-            "extensive_matrix": extensive_matrix,
-            "can_skip_libm_ci": str(self.can_skip_libm_ci()).lower(),
-        }
-        output = json.dumps(ret, separators=(",", ":"))
-        eprint(f"output: {output}")
+        ext_matrix = json.dumps({"extensive_matrix": matrix}, separators=(",", ":"))
+        can_skip = str(self.can_skip_libm_ci()).lower()
+        print(f"extensive_matrix={ext_matrix}")
+        print(f"can_skip_libm_ci={can_skip}")
+        eprint(f"extensive_matrix={ext_matrix}")
+        eprint(f"can_skip_libm_ci={can_skip}")
         eprint(f"total extensive tests: {total_to_test}")
 
         if error_on_many_tests and total_to_test > MANY_EXTENSIVE_THRESHOLD:
@@ -265,8 +265,6 @@ def make_workflow_output(self) -> str:
             )
             exit(1)
 
-        return output
-
 
 def locate_baseline(flags: list[str]) -> None:
     """Find the most recent baseline from CI, download it if specified.
@@ -421,8 +419,7 @@ def main():
     match sys.argv[1:]:
         case ["generate-matrix"]:
             ctx = Context()
-            output = ctx.make_workflow_output()
-            print(f"matrix={output}")
+            ctx.emit_workflow_output()
         case ["locate-baseline", *flags]:
             locate_baseline(flags)
         case ["check-regressions", *args]: