Skip to content

Commit dd783aa

Browse files
committed
try again
1 parent 9ce25b9 commit dd783aa

File tree

2 files changed

+26
-15
lines changed

2 files changed

+26
-15
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
matrix:
4646
config:
4747
- { os: ubuntu-22.04, compiler: clang-15, cc: clang-15, cxx: clang++-15 }
48-
package: ${{ needs.find-all-packages.outputs.packages }}
48+
${{ fromJson(needs.find-all-packages.outputs.packages) }}
4949
steps:
5050
- name: checkout
5151
uses: actions/checkout@v4

scripts/list_package_versions.py

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,12 @@
55
import yaml
66
import json
77

8+
89
def main():
910
parser = argparse.ArgumentParser(description="List package versions")
10-
parser.add_argument("--github", help="Format output for GitHub Actions", action="store_true")
11+
parser.add_argument(
12+
"--github", help="Format output for GitHub Actions", action="store_true"
13+
)
1114
args = parser.parse_args()
1215

1316
script_path = Path(__file__).resolve().parent
@@ -26,29 +29,37 @@ def main():
2629
config = yaml.safe_load(f)
2730

2831
for version, details in config["versions"].items():
29-
infos.append({
30-
"version": version,
31-
"folder": Path(details["folder"]),
32-
})
32+
infos.append(
33+
{
34+
"version": version,
35+
"folder": Path(details["folder"]),
36+
}
37+
)
3338

3439
package_infos[recipe_path.name] = infos
3540

3641
if args.github:
37-
result = [
38-
{
39-
"package_version": f"{package}/{infos["version"]}",
40-
"package": package,
41-
"version": infos["version"],
42-
"conanfile": str(Path("recipes") / package / infos["folder"] / "conanfile.py"),
43-
} for package in sorted(package_infos.keys())
44-
for infos in sorted(package_infos[package], key=lambda x: x["version"])
45-
]
42+
result = {
43+
"packages": [
44+
{
45+
"package_version": f"{package}/{infos["version"]}",
46+
"package": package,
47+
"version": infos["version"],
48+
"conanfile": str(
49+
Path("recipes") / package / infos["folder"] / "conanfile.py"
50+
),
51+
}
52+
for package in sorted(package_infos.keys())
53+
for infos in sorted(package_infos[package], key=lambda x: x["version"])
54+
]
55+
}
4656

4757
print("packages=" + json.dumps(result))
4858
else:
4959
for package in sorted(package_infos.keys()):
5060
infos = package_infos[package]
5161
print(f"{package}: {", ".join(sorted(info['version'] for info in infos))}")
5262

63+
5364
if __name__ == "__main__":
5465
main()

0 commit comments

Comments
 (0)