From b23c66249018190864de94b4700077d30f8e80bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?=
 <14975046+skjnldsv@users.noreply.github.com>
Date: Wed, 28 Oct 2026 18:58:25 +0100
Subject: [PATCH] ci: keep gh-pages root redirects on stable32 deploy
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The deploy job checked go.php/index.html and user_manual/index.html out
at the gh-pages root, then moved them into server/<version>/. That
deletes the root copies the scheduled master deploy maintains (see
#15951). Write them straight into the version folder with git show.

stable32 is out of the support window too, so it deploys on push again
like the other unsupported branches. Its deploy job only ran on
schedule, which never fires outside the default branch.

Assisted-by: ClaudeCode:claude-opus-5-5
Signed-off-by: John Molakvoæ <14975046+skjnldsv@users.noreply.github.com>
---
 .github/workflows/sphinxbuild.yml | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/sphinxbuild.yml b/.github/workflows/sphinxbuild.yml
index 09024f9e3bd..ddebdc2a7e2 100644
--- a/.github/workflows/sphinxbuild.yml
+++ b/.github/workflows/sphinxbuild.yml
@@ -555,7 +555,7 @@ jobs:
   deploy:
     name: Deploy documentation for gh-pages
     needs: stage-and-check
-    if: github.event_name == 'schedule' || github.event_name == 'workflow_dispatch'
+    if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
 
     permissions:
@@ -663,15 +663,14 @@ jobs:
 
           git fetch origin ${{ github.event.repository.default_branch }} ${{ github.ref_name }}
 
+          # git show, not checkout: gh-pages has its own copies at the root, leave them alone
           # Add go.php redirect from main branch
-          git checkout origin/${{ github.event.repository.default_branch }} -- go.php/index.html
           mkdir -p server/${branch}/go.php
-          mv go.php/index.html server/${branch}/go.php/index.html
+          git show origin/${{ github.event.repository.default_branch }}:go.php/index.html > server/${branch}/go.php/index.html
 
           # Add user_manual english redirect
-          git checkout origin/${{ github.ref_name }} -- user_manual/index.html
           mkdir -p server/${branch}/user_manual
-          mv user_manual/index.html server/${branch}/user_manual/index.html
+          git show origin/${{ github.ref_name }}:user_manual/index.html > server/${branch}/user_manual/index.html
 
           # Also copy to versioned folder if applicable
           if [ -n "${additional}" ]; then
@@ -911,11 +910,7 @@ jobs:
           then
             echo "This workflow ran for a pull request. We need stage-and-check and link-check to succeed, deploy must be skipped, and netlify-preview must succeed or fail (non-fatal on forks)"
             if ${{ needs.stage-and-check.result != 'success' || needs.link-check.result != 'success' || needs.deploy.result != 'skipped' || (needs.netlify-preview.result != 'success' && needs.netlify-preview.result != 'failure') }}; then exit 1; fi
-          elif ${{ github.event_name == 'push' }}
-          then
-            echo "This workflow ran for a push. We need stage-and-check and link-check to succeed; deploy and netlify-preview must be skipped"
-            if ${{ needs.stage-and-check.result != 'success' || needs.link-check.result != 'success' || needs.deploy.result != 'skipped' || needs.netlify-preview.result != 'skipped' }}; then exit 1; fi
           else
-            echo "This workflow ran on schedule or workflow_dispatch. We need stage-and-check, link-check, and deploy to succeed; netlify-preview must be skipped"
+            echo "This workflow ran for a push or workflow_dispatch. We need stage-and-check, link-check, and deploy to succeed; netlify-preview must be skipped"
             if ${{ needs.stage-and-check.result != 'success' || needs.link-check.result != 'success' || needs.deploy.result != 'success' || needs.netlify-preview.result != 'skipped' }}; then exit 1; fi
           fi