try again

opendocument-app · May 25, 2024 · dd783aa · dd783aa
1 parent 9ce25b9
commit dd783aa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -45,7 +45,7 @@ jobs:
       matrix:
         config:
           - { os: ubuntu-22.04, compiler: clang-15, cc: clang-15, cxx: clang++-15 }
-        package: ${{ needs.find-all-packages.outputs.packages }}
+        ${{ fromJson(needs.find-all-packages.outputs.packages) }}
     steps:
       - name: checkout
         uses: actions/checkout@v4

diff --git a/scripts/list_package_versions.py b/scripts/list_package_versions.py
@@ -5,9 +5,12 @@
 import yaml
 import json
 
+
 def main():
     parser = argparse.ArgumentParser(description="List package versions")
-    parser.add_argument("--github", help="Format output for GitHub Actions", action="store_true")
+    parser.add_argument(
+        "--github", help="Format output for GitHub Actions", action="store_true"
+    )
     args = parser.parse_args()
 
     script_path = Path(__file__).resolve().parent
@@ -26,29 +29,37 @@ def main():
             config = yaml.safe_load(f)
 
         for version, details in config["versions"].items():
-            infos.append({
-                "version": version,
-                "folder": Path(details["folder"]),
-            })
+            infos.append(
+                {
+                    "version": version,
+                    "folder": Path(details["folder"]),
+                }
+            )
 
         package_infos[recipe_path.name] = infos
 
     if args.github:
-        result = [
-            {
-                "package_version": f"{package}/{infos["version"]}",
-                "package": package,
-                "version": infos["version"],
-                "conanfile": str(Path("recipes") / package / infos["folder"] / "conanfile.py"),
-            } for package in sorted(package_infos.keys())
-              for infos in sorted(package_infos[package], key=lambda x: x["version"])
-        ]
+        result = {
+            "packages": [
+                {
+                    "package_version": f"{package}/{infos["version"]}",
+                    "package": package,
+                    "version": infos["version"],
+                    "conanfile": str(
+                        Path("recipes") / package / infos["folder"] / "conanfile.py"
+                    ),
+                }
+                for package in sorted(package_infos.keys())
+                for infos in sorted(package_infos[package], key=lambda x: x["version"])
+            ]
+        }
 
         print("packages=" + json.dumps(result))
     else:
         for package in sorted(package_infos.keys()):
             infos = package_infos[package]
             print(f"{package}: {", ".join(sorted(info['version'] for info in infos))}")
 
+
 if __name__ == "__main__":
     main()