From 040b8a6333c151803e6dbf603fbe2e7e9413638b 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:22 +0100 Subject: [PATCH] ci: keep gh-pages root redirects on stable30 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//. That deletes the root copies the scheduled master deploy maintains (see #15951). Write them straight into the version folder with git show. Assisted-by: ClaudeCode:claude-opus-5-5 Signed-off-by: John Molakvoæ <14975046+skjnldsv@users.noreply.github.com> --- .github/workflows/sphinxbuild.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/sphinxbuild.yml b/.github/workflows/sphinxbuild.yml index 4474df42987..9c66a58a825 100644 --- a/.github/workflows/sphinxbuild.yml +++ b/.github/workflows/sphinxbuild.yml @@ -483,15 +483,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