From 9c95f3d554574dc7950c16a96289ea47e9f8a0fc Mon Sep 17 00:00:00 2001 From: Jared Frazier Date: Mon, 2 Nov 2026 11:54:11 +0100 Subject: [PATCH 1/2] [#1664] keep develop docs (i.e., prevent overwriting) when merging to master --- .github/workflows/merge.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 42e3bef4a78..d111ac13716 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -66,6 +66,7 @@ jobs: publish_dir: ./docs/build/html destination_dir: . force_orphan: true + keep_files: true - name: Deploy develop branch merges to /develop if: success() && github.ref_name == 'develop' uses: peaceiris/actions-gh-pages@v3 From 74a4152678c7a7303df278b5bcf7c69fd2e2906e Mon Sep 17 00:00:00 2001 From: Jared Frazier Date: Mon, 2 Nov 2026 11:57:36 +0100 Subject: [PATCH 2/2] [#1664] document the preservation of dev docs fix --- .../bskReleaseNotesSnippets/1664-preserve-develop-docs.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 docs/source/Support/bskReleaseNotesSnippets/1664-preserve-develop-docs.rst diff --git a/docs/source/Support/bskReleaseNotesSnippets/1664-preserve-develop-docs.rst b/docs/source/Support/bskReleaseNotesSnippets/1664-preserve-develop-docs.rst new file mode 100644 index 00000000000..65e79326937 --- /dev/null +++ b/docs/source/Support/bskReleaseNotesSnippets/1664-preserve-develop-docs.rst @@ -0,0 +1 @@ +- Fixed documentation deployment so publishing the main site preserves the development documentation at ``/develop`` (#1664).