Update the build

Author: jeremi

.cloudflare/pages.yml

@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - "**"
+    branches-ignore:
+      - cf-pages
 
 jobs:
   build_deploy:
@@ -32,7 +34,7 @@ jobs:
 
       # Set safe branch name for preview deployments
       - name: Set safe branch name
-        if: github.ref != 'refs/heads/main'
+        if: github.ref != 'refs/heads/stable'
         id: branch
         run: |
           # Sanitize branch name: only allow alphanumeric, dots, underscores, hyphens
@@ -41,48 +43,52 @@ jobs:
           echo "safe=${SAFE_NAME}" >> $GITHUB_OUTPUT
 
       # Build documentation with appropriate environment variables
-      - name: Prepare deploy (main/stable)
-        if: github.ref == 'refs/heads/main'
+      - name: Prepare deploy (stable)
+        if: github.ref == 'refs/heads/stable'
         run: |
           set -e  # Exit on error
           export DOCS_VERSION=stable
           export DOCS_BASEURL=https://docs.openspp.org/
           export IS_PREVIEW=0
+          export DOCS_GITHUB_VERSION=stable
           make deploy || { echo "Build failed"; exit 1; }
 
       - name: Prepare deploy (preview)
-        if: github.ref != 'refs/heads/main'
+        if: github.ref != 'refs/heads/stable'
         run: |
           set -e  # Exit on error
           export DOCS_VERSION=${{ steps.branch.outputs.safe }}
           export DOCS_BASEURL=https://docs.openspp.org/previews/${{ steps.branch.outputs.safe }}/
           export IS_PREVIEW=1
+          export DOCS_GITHUB_VERSION=${GITHUB_REF_NAME}
           make deploy || { echo "Build failed"; exit 1; }
 
       # Deploy stable documentation (main branch)
-      - name: Deploy stable documentation
-        if: github.ref == 'refs/heads/main'
+      - name: Deploy stable documentation (to cf-pages branch)
+        if: github.ref == 'refs/heads/stable'
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: _build/html
+          publish_branch: cf-pages
           keep_files: true  # Don't delete preview versions
 
       # Deploy preview documentation (non-main branches)
-      - name: Deploy preview documentation
-        if: github.ref != 'refs/heads/main'
+      - name: Deploy preview documentation (to cf-pages branch)
+        if: github.ref != 'refs/heads/stable'
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
           publish_dir: _build/html
+          publish_branch: cf-pages
           destination_dir: previews/${{ steps.branch.outputs.safe }}
           keep_files: true  # Don't delete other versions
 
       - name: Display deployment status
         run: |
-          if [ "${{ github.ref }}" == "refs/heads/main" ]; then
+          if [ "${{ github.ref }}" == "refs/heads/stable" ]; then
             echo "✅ Deployed stable documentation to https://docs.openspp.org/"
           else
             BRANCH_SAFE=$(echo ${GITHUB_REF_NAME} | sed 's/\//-/g')
             echo "✅ Deployed preview documentation to https://docs.openspp.org/previews/${BRANCH_SAFE}/"
-          fi
+          fi

.github/workflows/build_deploy.yml

@@ -18,17 +18,17 @@ on:
 jobs:
   cleanup:
     runs-on: ubuntu-latest
-    if: github.ref == 'refs/heads/main'  # Only run from main branch
+    if: github.ref == 'refs/heads/stable'  # Only run from stable branch
 
     permissions:
       contents: write
       pages: write
 
     steps:
-      - name: Checkout gh-pages branch
+      - name: Checkout cf-pages branch
         uses: actions/checkout@v3
         with:
-          ref: gh-pages
+          ref: cf-pages
 
       - name: Cleanup old preview deployments
         run: |
@@ -168,4 +168,4 @@ Cleanup policy:
             echo "- Total previews found: $(wc -l < /tmp/preview_list.txt)" >> $GITHUB_STEP_SUMMARY
           fi
           echo "- Keep policy: ${KEEP_DAYS:-30} days, minimum ${KEEP_COUNT:-10} previews" >> $GITHUB_STEP_SUMMARY
-          echo "- Cleanup completed successfully" >> $GITHUB_STEP_SUMMARY
+          echo "- Cleanup completed successfully" >> $GITHUB_STEP_SUMMARY

.github/workflows/cleanup_previews.yml

@@ -143,6 +143,8 @@
 DOCS_VERSION = os.getenv("DOCS_VERSION", "stable")
 DOCS_BASEURL = os.getenv("DOCS_BASEURL", "https://docs.openspp.org/")
 IS_PREVIEW = os.getenv("IS_PREVIEW", "0") == "1"
+# Prefer the exact Git ref for edit links on previews; fall back to DOCS_VERSION
+GITHUB_VERSION = os.getenv("DOCS_GITHUB_VERSION", ("stable" if not IS_PREVIEW else DOCS_VERSION))
 
 # Update version display based on environment
 if DOCS_VERSION != "stable":
@@ -587,7 +589,7 @@
     "display_github": True,
     "github_user": "openspp",  # Username
     "github_repo": "documentation",  # Repo name
-    "github_version": "main",  # Version
+    "github_version": GITHUB_VERSION,  # Branch or tag used for edit links
     "conf_py_path": "/docs/",  # Path in the checkout to the docs root
     "is_preview": IS_PREVIEW,  # Flag for preview builds to add noindex meta tag
 }