fix: sort packages and filter out cached ones

Author: jfroche

.github/workflows/nix-build.yml

@@ -30,8 +30,6 @@ jobs:
         run: |
           set -Eeu
           echo matrix="$(python scripts/github-matrix.py extensions)" >> "$GITHUB_OUTPUT"
-          # XXX debugging
-          exit 1
 
   build-extensions-aarch64-linux:
     name: ${{matrix.postgresql_version}}.${{ matrix.name }} (aarch64-linux)

nix/packages/postgres.nix

@@ -158,10 +158,12 @@
       #    install.
       #  - exts: an attrset containing all the extensions, mapped to their
       #    package names.
-      makePostgres = version: lib.recurseIntoAttrs {
-        bin = makePostgresBin version;
-        exts = makeOurPostgresPkgsSet version;
-      };
+      makePostgres =
+        version:
+        lib.recurseIntoAttrs {
+          bin = makePostgresBin version;
+          exts = makeOurPostgresPkgsSet version;
+        };
       basePackages = {
         psql_15 = makePostgres "15";
         psql_17 = makePostgres "17";

scripts/github-matrix.py

@@ -1,6 +1,7 @@
 #!/usr/bin/env python3
 
 import argparse
+from collections import defaultdict
 import json
 import os
 import subprocess
@@ -133,8 +134,7 @@ def run_nix_eval_jobs(
 
         for line in process.stdout:
             package = parse_nix_eval_line(line, drv_paths, target)
-            if package and not package["already_cached"]:
-                print(f"Found package: {package['attr']}", file=sys.stderr)
+            if package:
                 yield package
 
         if process.returncode and process.returncode != 0:
@@ -168,23 +168,22 @@ def main() -> None:
 
     cmd = build_nix_eval_command(max_workers, flake_output)
 
-    gh_action_packages = list(run_nix_eval_jobs(cmd, flake_output))
+    gh_action_packages = sorted(
+        list(run_nix_eval_jobs(cmd, flake_output)), key=lambda pkg: pkg["name"]
+    )
 
     if args.target == "extensions":
         # filter to only include extension packages and add postgresql_version field
         gh_action_packages = [
             {**pkg, "postgresql_version": pkg["attr"].split(".")[-3]}
             for pkg in gh_action_packages
-            if is_extension_pkg(pkg)
+            if is_extension_pkg(pkg) and not pkg["already_cached"]
         ]
 
         # Group packages by system
-        grouped_by_system = {}
+        grouped_by_system = defaultdict(list)
         for pkg in gh_action_packages:
-            system = pkg["system"]
-            if system not in grouped_by_system:
-                grouped_by_system[system] = []
-            grouped_by_system[system].append(pkg)
+            grouped_by_system[pkg["system"]].append(pkg)
 
         # Create output with system-specific matrices
         gh_output = {}