From e6541c5c93c3a89316a813fc540bebe71ee71de6 Mon Sep 17 00:00:00 2001 From: Johannes Altmanninger Date: Thu, 25 Sep 2025 11:54:51 +0200 Subject: [PATCH] Enable sphinx parallelism also when building markdown release notes We get a warning about sphinx_markdown_builder not being parallelizable. Fix that. Ref: https://github.com/liran-funaro/sphinx-markdown-builder/pull/38 --- .github/actions/install-sphinx-markdown-builder/action.yml | 3 ++- build_tools/release-notes.sh | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/actions/install-sphinx-markdown-builder/action.yml b/.github/actions/install-sphinx-markdown-builder/action.yml index 5f58f32cb..5cbfb5768 100644 --- a/.github/actions/install-sphinx-markdown-builder/action.yml +++ b/.github/actions/install-sphinx-markdown-builder/action.yml @@ -6,5 +6,6 @@ permissions: runs: using: "composite" steps: - - run: pip install sphinx-markdown-builder==0.6.8 + - run: | + pip install git+https://github.com/krobelus/sphinx-markdown-builder@ae8cf577bfb263dcda509ad449a331b9b74664fa shell: bash diff --git a/build_tools/release-notes.sh b/build_tools/release-notes.sh index 61d93ada3..b45a994b3 100755 --- a/build_tools/release-notes.sh +++ b/build_tools/release-notes.sh @@ -33,10 +33,9 @@ changelog_for_this_version=$(awk <"$workspace_root/CHANGELOG.rst" ' printf %s "$changelog_for_this_version" | sed -e '$s/^----*$//' >"$relnotes_tmp/fake-workspace"/CHANGELOG.rst -# Use "-j 1" because sphinx-markdown-builder is not marked concurrency-safe. -sphinx-build >&2 -j 1 \ +sphinx-build >&2 -j auto \ -W -E -b markdown -c "$workspace_root/doc_src" \ - -d "$relnotes_tmp/doctree" "$relnotes_tmp/fake-workspace/doc_src" $relnotes_tmp/out \ + -d "$relnotes_tmp/doctree" "$relnotes_tmp/fake-workspace/doc_src" "$relnotes_tmp/out" \ -D markdown_http_base="https://fishshell.com/docs/$minor_version" \ -D markdown_uri_doc_suffix=".html" \ "$@"