From 12a235c358958c3ddc91e23e08da900494e771b8 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sat, 14 Sep 2024 07:49:58 -0400
Subject: [PATCH] ci: `before` is a top level field (#10129)

---
 .github/workflows/ibis-docs-main.yml | 33 ++++++++++++++++++++++------
 .github/workflows/ibis-docs-pr.yml   | 31 +++++++++++++++++++++-----
 2 files changed, 51 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ibis-docs-main.yml b/.github/workflows/ibis-docs-main.yml
index 9b9a41c73f87..15157a28d509 100644
--- a/.github/workflows/ibis-docs-main.yml
+++ b/.github/workflows/ibis-docs-main.yml
@@ -15,7 +15,31 @@ permissions:
   contents: read
 
 jobs:
-  docs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: install nix
+        uses: cachix/install-nix-action@v27
+        with:
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+
+      - name: setup cachix
+        uses: cachix/cachix-action@v15
+        with:
+          name: ibis
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          extraPullNames: nix-community,poetry2nix
+
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: run doctests
+        # keep HOME because duckdb (which we use for doctests) wants to use
+        # that for extensions
+        run: nix develop --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest
+
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: install nix
@@ -39,14 +63,9 @@ jobs:
         with:
           # https://docs.github.com/en/webhooks/webhook-events-and-payloads#push
           # > The SHA of the most recent commit on ref before the push.
-          key: docs-${{ github.event.push.before }}
+          key: docs-${{ github.event.before }}
           path: docs/**/.jupyter_cache
 
-      - name: run doctests
-        # keep HOME because duckdb (which we use for doctests) wants to use
-        # that for extensions
-        run: nix develop --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest
-
       - name: build api docs
         run: nix develop --ignore-environment -c just docs-apigen --verbose
 
diff --git a/.github/workflows/ibis-docs-pr.yml b/.github/workflows/ibis-docs-pr.yml
index 94f566c1676a..0551f57b183f 100644
--- a/.github/workflows/ibis-docs-pr.yml
+++ b/.github/workflows/ibis-docs-pr.yml
@@ -17,7 +17,31 @@ permissions:
   contents: read
 
 jobs:
-  docs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: install nix
+        uses: cachix/install-nix-action@v27
+        with:
+          extra_nix_config: |
+            access-tokens = github.com=${{ secrets.GITHUB_TOKEN }}
+
+      - name: setup cachix
+        uses: cachix/cachix-action@v15
+        with:
+          name: ibis
+          authToken: ${{ secrets.CACHIX_AUTH_TOKEN }}
+          extraPullNames: nix-community,poetry2nix
+
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: run doctest
+        # keep HOME because duckdb (which we use for doctests) wants to use
+        # that for extensions
+        run: nix develop --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest
+
+  build:
     runs-on: ubuntu-latest
     steps:
       - name: install nix
@@ -42,11 +66,6 @@ jobs:
           key: docs-${{ github.event.pull_request.base.sha }}
           path: docs/**/.jupyter_cache
 
-      - name: run doctest
-        # keep HOME because duckdb (which we use for doctests) wants to use
-        # that for extensions
-        run: nix develop --ignore-environment --keep HOME --keep HYPOTHESIS_PROFILE -c just doctest
-
       - name: generate api docs
         run: nix develop --ignore-environment -c just docs-apigen --verbose