ci: before is a top level field (#10129)

ibis-project · Sep 14, 2024 · 12a235c · 12a235c
1 parent 45cf899
commit 12a235c
Show file tree

Hide file tree

Showing 2 changed files with 51 additions and 13 deletions.
diff --git 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
@@ -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