From d132d60b8a0835d816c6ffae0b9a75d65fae90f0 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Sat, 13 Jun 2026 00:48:13 +0200
Subject: [PATCH 1/2] Set GIT_BRANCH as an env variable

---
 .github/workflows/build.yml | 3 ++-
 Makefile                    | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2e37933cd7f..dffaf8ebf2e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -18,9 +18,10 @@ jobs:
           python-version: 3.13
 
       - name: Build docs
+        env:
+          GIT_BRANCH: ${{ github.ref_name }}
         run: |
           pip install -r requirements.txt
-          echo "GIT_BRANCH=$(echo $GITHUB_REF | cut -d '/' -f 3)" >> $GITHUB_ENV
           ./scripts/ci_build_docs.sh
 
       # Deploy release branch to mapserver.github.io
diff --git a/Makefile b/Makefile
index 9f202e4ee42..b602166cedb 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ BUILD_LANGUAGES = $(TRANSLATIONS)
 # Internal variables.
 PAPEROPT_a4     = -D latex_paper_size=a4
 PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees/$$lang $(SPHINXOPTS) -c . -A language=$$lang -D language=$$lang -A languages='$(LANGUAGES)' -A branch=$(GIT_BRANCH)
+ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees/$$lang $(SPHINXOPTS) -c . -A language=$$lang -D language=$$lang -A languages='$(LANGUAGES)'
 
 ALLSPHINXOPTSI18N = $(SPHINXOPTS) -c . -a -A language=$$lang -D language=$$lang -A languages='$(LANGUAGES)'
 

From 87ac387d031e15845e2a2d5b5b489094a5c26e82 Mon Sep 17 00:00:00 2001
From: sethg <sethg@geographika.co.uk>
Date: Sat, 13 Jun 2026 00:50:59 +0200
Subject: [PATCH 2/2] Echo output

---
 scripts/ci_build_docs.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/ci_build_docs.sh b/scripts/ci_build_docs.sh
index 2b1c445441b..e78745e50c2 100755
--- a/scripts/ci_build_docs.sh
+++ b/scripts/ci_build_docs.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+echo "GIT_BRANCH is: $GIT_BRANCH"
 
 git log -n1 | grep -q "\\[build_pdf\\]"