From 0d46c26988f04076a0013dc3b0856772f1a53bbf Mon Sep 17 00:00:00 2001
From: Johannes Altmanninger <aclopte@gmail.com>
Date: Thu, 18 Sep 2025 09:54:13 +0200
Subject: [PATCH] github release workflow: work around trailing "---"-line in
 changelog

The extracted release notes trigger a sphinx warning

	/tmp/tmp.V6RGP92nc2/src/index.rst:6:Document may not end with a transition.

which we don't seem to get on the full CHANGELOG.rst.
Let's work around that for now.
---
 .github/workflows/release.yml | 13 ++++++++-----
 CHANGELOG.rst                 |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ad520fbfb..e65829de8 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,15 +50,18 @@ jobs:
             mkdir "$relnotes_tmp/src" "$relnotes_tmp/out"
             version=$(git describe)
             minor_version=${version%.*}
-            # Delete notes for prior releases.
-            # Also fix up any relative references to other documentation files.
-            awk <CHANGELOG.rst '
+            changelog_for_this_version=$(awk <CHANGELOG.rst '
               /^fish/ && $2 != "'"$version"'" { exit }
               { print }
-            ' |
+            ')
+            # Also fix up any relative references to other documentation files.
+            # Also remove spurious transitions at the end of the document.
+            printf %s "$changelog_for_this_version" |
               sed >"$relnotes_tmp/src"/index.rst \
                 -e 's,:doc:`\(.*\) <\([^>]*\)>`,`\1 <https://fishshell.com/docs/'"$minor_version"'/\2.html>`_,g' \
-                -e 's,:envvar:`\([^`]*\)`,``$\1``,g'
+                -e 's,:envvar:`\([^`]*\)`,``$\1``,g' \
+                -e '$s/^----*$//'
+
             # In future, we could reuse doctree from when we made HTML docs.
             sphinx-build -j 1 $(: "sphinx-markdown-builder is not marked concurrency-safe") \
               -W -E -b markdown -c doc_src \
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index f7c2b7749..1e83260e0 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -108,7 +108,7 @@ For distributors
 
 --------------
 
-fish 4.0.7 (released September 18, 2025)
+fish 4.0.8 (released September 18, 2025)
 ========================================
 
 This release fixes a regression in 4.0.6 that caused user bindings to be shadowed by either fish's or a plugin's bindings (:issue:`11803`).