Merge branch 'MapServer:main' into main

jmckenna · web-flow · commit 624625938310 · 2026-06-15T14:52:35.000-03:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -5,6 +5,8 @@ on: [push, pull_request, workflow_dispatch]
 jobs:
   build:
     runs-on: ubuntu-latest
+    permissions:
+      contents: write
 
     steps:
       - name: Checkout repository contents
@@ -16,12 +18,14 @@ 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
 
-      - name: After success steps
+      # Deploy release branch to mapserver.github.io
+      - name: Deploy to mapserver.github.io
         if: ${{ success() && github.event_name == 'push' && github.repository == 'MapServer/MapServer-documentation' && github.ref_name == 'branch-8-6' }}
         run: |
           # setup the SSH key
@@ -36,3 +40,11 @@ jobs:
           sha=$(git rev-parse --short ${{ github.sha }})
           echo "publish website using $GIT_BRANCH branch and commit $sha"
           ./scripts/ci_deploy_website.sh build /tmp $sha
+
+      # Deploy main branch to gh-pages branch (same repo)
+      - name: Deploy to gh-pages
+        if: ${{ success() && github.event_name == 'push' && github.repository == 'MapServer/MapServer-documentation' && github.ref_name == 'main' }}
+        run: |
+          sha=$(git rev-parse --short ${{ github.sha }})
+          echo "Publishing main branch (commit $sha) to gh-pages"
+          ./scripts/ci_deploy_gh_pages.sh ${{ github.workspace }}/build $sha ${{ secrets.GITHUB_TOKEN }}
diff --git 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)'
 
diff --git a/_templates/layout.html b/_templates/layout.html
@@ -3,8 +3,8 @@
 {% block relbar1 %}
 
 
-<!-- for main branch only, do not backport this -->
 {%- if branch == 'main' %}
+<!-- add a ribbon to show these docs are the main branch -->
 <h4 class="ribbon">DOCS PREVIEW</h4>
 {%- endif %}
 
diff --git a/conf.py b/conf.py
@@ -11,7 +11,7 @@
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 
-import sys, os, shutil
+import sys, os
 import inspect
 from unittest.mock import MagicMock #py3 only
 
@@ -243,8 +243,8 @@ def __getattr__(cls, name):
 html_theme = "classic"
 
 # Add the branch name as a variable that can be used in templates
-# this can be set as a sphinx-build option using `-A BRANCH=main`
-html_context = {'branch': release}
+# Defaults to 'local'if GIT_BRANCH isn't set (e.g. local builds)
+html_context = {'branch': os.environ.get('GIT_BRANCH', 'local')}
 
 # linkcheck options
 # -----------------
diff --git a/en/announcements/announcements_archive.txt b/en/announcements/announcements_archive.txt
@@ -33,6 +33,7 @@ The security release of MapServer 8.6.3 has been issued in order to fix
 a vulnerability in the SLD parser. See the :ref:`changelog <changelog-8-6-3>` 
 for the list of changes. 
 You may also review this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-4h8g-378q-r75m>`__,  
+the CVE record: `CVE-2026-45104 <https://www.cve.org/CVERecord?id=CVE-2026-45104>`__, 
 as well as MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
 As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
 all users are strongly encouraged to upgrade to the MapServer 8.6.3 release (see the 
@@ -57,6 +58,7 @@ The security release of MapServer 8.6.2 has been issued in order to fix
 a vulnerability in the OpenLayers viewer (with WMS 1.3.0 requests).
 See the :ref:`changelog <changelog-8-6-2>` for the list of changes. 
 You may also review this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-4g9f-ph64-hg2x>`__,  
+the CVE record: `CVE-2026-42030 <https://www.cve.org/CVERecord?id=CVE-2026-42030>`__, 
 as well as MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
 As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
 all users are strongly encouraged to upgrade to the MapServer 8.6.2 release (see the 
diff --git a/en/include/announcements.inc b/en/include/announcements.inc
@@ -27,6 +27,7 @@ The security release of MapServer 8.6.3 has been issued in order to fix
 a vulnerability in the SLD parser. See the :ref:`changelog <changelog-8-6-3>` 
 for the list of changes. 
 You may also review this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-4h8g-378q-r75m>`__,  
+the CVE record: `CVE-2026-45104 <https://www.cve.org/CVERecord?id=CVE-2026-45104>`__, 
 as well as MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
 As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
 all users are strongly encouraged to upgrade to the MapServer 8.6.3 release (see the 
@@ -51,6 +52,7 @@ The security release of MapServer 8.6.2 has been issued in order to fix
 a vulnerability in the OpenLayers viewer (with WMS 1.3.0 requests).
 See the :ref:`changelog <changelog-8-6-2>` for the list of changes. 
 You may also review this `Security Advisory <https://github.com/MapServer/MapServer/security/advisories/GHSA-4g9f-ph64-hg2x>`__,  
+the CVE record: `CVE-2026-42030 <https://www.cve.org/CVERecord?id=CVE-2026-42030>`__, 
 as well as MapServer's `Security Policy <https://github.com/MapServer/MapServer/blob/main/SECURITY.md>`__.
 As security for the 7.6 branch has ended, and branches 8.4, 8.2 & 8.0 are not supported, 
 all users are strongly encouraged to upgrade to the MapServer 8.6.2 release (see the 
diff --git 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\\]"
 
diff --git a/scripts/ci_deploy_gh_pages.sh b/scripts/ci_deploy_gh_pages.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+# Deploys the main branch HTML build output to the gh-pages branch of the
+# MapServer-documentation repo. Called from build.yml when a push to main
+# is detected
+
+set -euo pipefail
+
+builddir=$1
+sha=$2
+github_token=$3
+
+git config --global user.email "mapserverbot@mapserver.bot"
+git config --global user.name "MapServer deploybot"
+
+git clone --depth=1 \
+  https://x-access-token:${github_token}@github.com/MapServer/MapServer-documentation.git \
+  /tmp/MapServer-documentation
+
+cd /tmp/MapServer-documentation
+git checkout --orphan gh-pages
+git rm -rf . || true
+
+# add in the new build files
+cp -a "$builddir/html/." .
+touch .nojekyll
+
+git add -A
+git commit -m "update with results of commit https://github.com/MapServer/MapServer-documentation/commit/$sha" --quiet || echo "Nothing to commit"
+git push origin gh-pages --force

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#!/bin/bash`
	`2`	`+echo "GIT_BRANCH is: $GIT_BRANCH"`
`2`	`3`
`3`	`4`	`git log -n1 \| grep -q "\\[build_pdf\\]"`
`4`	`5`