From 179f6983af384fbd39c948a6ca0d20e9d6730f52 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Sat, 14 Sep 2024 17:45:03 -0400
Subject: [PATCH] ci: Decouple website workflow

We use `om ci`'s JSON support here.
---
 .github/workflows/ci.yaml      | 63 ++++++++++++++--------------------
 .github/workflows/website.yaml | 38 ++++++++++++++++++++
 2 files changed, 63 insertions(+), 38 deletions(-)
 create mode 100644 .github/workflows/website.yaml

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 915902d5..bca75b60 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -7,10 +7,22 @@ on:
   pull_request:
 
 jobs:
+  website:
+    if: github.ref == 'refs/heads/main'
+    needs: main
+    uses: ./.github/workflows/website.yaml
+    with:
+      static-site-path: ${{ needs.main.outputs.OMWEBSITE }}
+    secrets: inherit
+
   main:
     runs-on: ${{ matrix.system }}
     permissions:
       contents: read
+    outputs:
+      # It is important to match the matrix.system here
+      # With that of website.yaml
+      OMWEBSITE: ${{ steps.omci.outputs.OMWEBSITE_x86_64-linux }}
     strategy:
       matrix:
         system: [x86_64-linux, aarch64-darwin, x86_64-darwin]
@@ -35,21 +47,29 @@ jobs:
               --write-results=$HOME/omci.json
 
       - name: Omnix results
+        id: omci
         run: |
           cat $HOME/omci.json | jq
-          cat $HOME/omci.json | jq -r '.omnix.build.byName."omnix-cli"'
+
+          # Retrieve the store path for the given package out of the given subflake.
+          get_output() {
+            subflake=$1 name=$2 \
+            jq -r '.[$ENV.subflake].build.byName.[$ENV.name]' < $HOME/omci.json
+          }
+
+          echo "OMCIJSON=$(cat $HOME/omci.json)" >> "$GITHUB_OUTPUT"
+          echo "OMPACKAGE=$(get_output omnix omnix-cli)" >> "$GITHUB_OUTPUT"
+          echo "OMWEBSITE_${{ matrix.system }}=$(get_output doc omnix-mdbook-site)" >> "$GITHUB_OUTPUT"
 
       # Upload static binary for the next job.
       # TODO: This should ideally be in a separate workflow file, running parallel to the main job.
-      - name: "static-binary: Lookup"
-        if: matrix.system != 'x86_64-darwin'
-        run: echo "om_static_binary_path=$(jq -r '.omnix.build.byName."omnix-cli"' < $HOME/omci.json)" >> "$GITHUB_ENV"
       - name: "static-binary: Upload"
         if: matrix.system != 'x86_64-darwin'
         uses: actions/upload-artifact@v4
         with:
           name: om-${{ matrix.system }}
-          path: ${{ env.om_static_binary_path }}/bin/om
+          path: ${{ steps.omci.outputs.OMPACKAGE }}/bin/om
+          if-no-files-found: error
 
       # Push the Nix cache
       - name: Push to cachix
@@ -89,36 +109,3 @@ jobs:
             echo "om binary failed due to lack of nix installation, as expected."
             exit 0
           fi
-
-  website-build:
-    if: github.ref == 'refs/heads/main'
-    # needs: static-binary-check
-    runs-on: x86_64-linux
-    steps:
-      - uses: actions/checkout@v4
-      - name: Build the website (Nix) 🔧
-        run: |
-          nix build ./doc -o ./_site
-      - name: Upload artifact
-        uses: actions/upload-pages-artifact@v3
-  website-deploy:
-    if: github.ref == 'refs/heads/main'
-    environment:
-      name: github-pages
-      url: ${{ steps.deployment.outputs.page_url }}
-    # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-    permissions:
-      contents: read
-      pages: write
-      id-token: write
-    # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-    # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-    concurrency:
-      group: "pages"
-      cancel-in-progress: false
-    runs-on: x86_64-linux
-    needs: website-build
-    steps:
-      - name: Deploy to GitHub Pages
-        id: deployment
-        uses: actions/deploy-pages@v4
diff --git a/.github/workflows/website.yaml b/.github/workflows/website.yaml
new file mode 100644
index 00000000..a1428a44
--- /dev/null
+++ b/.github/workflows/website.yaml
@@ -0,0 +1,38 @@
+name: Website Deploy
+
+on:
+  workflow_call:
+    inputs:
+      static-site-path:
+        type: string
+        required: true
+        description: "Path to the static site to deploy"
+
+jobs:
+  upload:
+    runs-on: x86_64-linux
+    steps:
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: ${{ inputs.static-site-path }}
+  deploy:
+    runs-on: x86_64-linux
+    needs: upload
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+    permissions:
+      contents: read
+      pages: write
+      id-token: write
+    # Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+    # However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+    concurrency:
+      group: "pages"
+      cancel-in-progress: false
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4