fix(ci): do not hide cached builds

Author: jfroche

.github/actions/nix-build-setup/action.yml

@@ -8,17 +8,23 @@ inputs:
     description: 'AWS role session duration in seconds'
     required: false
     default: '3600'
+  cached:
+    description: 'Whether to use cached builds'
+    required: false
+    default: 'false'
 
 runs:
   using: 'composite'
   steps:
     - name: aws-oidc
+      if: ${{ inputs.cached == 'false' }}
       uses: aws-actions/[email protected]
       with:
         aws-region: us-east-2
         role-to-assume: arn:aws:iam::279559813984:role/supabase-github-oidc-role # Shared Services
         role-session-name: gha-oidc-${{ github.run_id }}
     - name: aws-creds
+      if: ${{ inputs.cached == 'false' }}
       uses: aws-actions/[email protected]
       with:
         disable-retry: true
@@ -29,6 +35,7 @@ runs:
         role-skip-session-tagging: true
         role-duration-seconds: ${{ inputs.aws-role-duration }}
     - name: Write creds files
+      if: ${{ inputs.cached == 'false' }}
       shell: bash
       run: |
         umask 006
@@ -39,5 +46,10 @@ runs:
         aws_session_token = ${AWS_SESSION_TOKEN}
         EOF
     - name: nix build
+      if: ${{ inputs.cached == 'false' }}
       shell: bash
       run: nix build -L .#${{ inputs.attr }}
+    - name: nix build
+      if: ${{ inputs.cached == 'true' }}
+      shell: bash
+      run: echo "Skipping build of ${{ inputs.attr }} as it's marked cached"

.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)
@@ -49,6 +47,7 @@ jobs:
         uses: ./.github/actions/nix-build-setup
         with:
           attr: ${{ matrix.attr }}
+          cached: ${{ matrix.is_cached }}
 
   build-extensions-aarch64-darwin:
     name: ${{matrix.postgresql_version}}.${{ matrix.name }} (aarch64-darwin)
@@ -66,6 +65,7 @@ jobs:
         uses: ./.github/actions/nix-build-setup
         with:
           attr: ${{ matrix.attr }}
+          cached: ${{ matrix.is_cached }}
 
   build-extensions-x86_64-linux:
     name: ${{matrix.postgresql_version}}.${{ matrix.name }} (x86_64-linux)
@@ -83,6 +83,7 @@ jobs:
         uses: ./.github/actions/nix-build-setup
         with:
           attr: ${{ matrix.attr }}
+          cached: ${{ matrix.is_cached }}
 
 
   checks-matrix:
@@ -117,6 +118,7 @@ jobs:
         uses: ./.github/actions/nix-build-setup
         with:
           attr: ${{ matrix.attr }}
+          cached: ${{ matrix.is_cached }}
 
   run-tests:
     needs: build-checks

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

@@ -46,7 +46,7 @@ class GitHubActionPackage(TypedDict):
     attr: str
     name: str
     system: str
-    already_cached: bool
+    is_cached: bool
     runs_on: RunsOnConfig
     postgresql_version: NotRequired[str]
 
@@ -103,17 +103,21 @@ def parse_nix_eval_line(
     try:
         data: NixEvalJobsOutput = json.loads(line)
         if data["drvPath"] in drv_paths:
-            return None
-        drv_paths.add(data["drvPath"])
+            print(f"Skipping duplicate drvPath: {data['drvPath']}", file=sys.stderr)
+            data["cacheStatus"] = "cached"
+        else:
+            drv_paths.add(data["drvPath"])
 
         runs_on_config = BUILD_RUNNER_MAP[data["system"]]
 
         return {
             "attr": f"{target}.{data['attr']}",
             "name": data["name"],
             "system": data["system"],
-            "already_cached": data.get("cacheStatus") != "notBuilt",
+            "is_cached": data.get("cacheStatus") != "notBuilt",
             "runs_on": runs_on_config,
+            "drvPath": data["drvPath"],  # For debugging purposes
+            "outputs": data.get("outputs", {}),  # For debugging purposes
         }
     except json.JSONDecodeError:
         print(f"Skipping invalid JSON line: {line}", file=sys.stderr)
@@ -133,8 +137,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:
@@ -186,6 +189,9 @@ def main() -> None:
                 grouped_by_system[system] = []
             grouped_by_system[system].append(pkg)
 
+        print("Grouped packages by system:", file=sys.stderr)
+        print(json.dumps(grouped_by_system, indent=2), file=sys.stderr)
+
         # Create output with system-specific matrices
         gh_output = {}
         for system, packages in grouped_by_system.items():