From bfdc6f70989d25d65215b81034f1813c4de8fead Mon Sep 17 00:00:00 2001 From: Tom Cobb Date: Fri, 3 Jul 2026 15:43:40 +0000 Subject: [PATCH 1/2] CI: bump myst-version-switcher-plugin to v0.22.0 Reusable workflows and the in-page switcher plugin were pinned at v0.18.0; pick up the fixes and review changes released through v0.21.0 (filename-agnostic gather, custom domains, smoother migration, Sphinx support) and v0.22.0 (auto-retry when the Pages origin wedges). --- .github/workflows/ci.yml | 4 ++-- .github/workflows/publish-dispatch.yml | 2 +- docs/myst.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a3d70c1..6757e55 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,7 +40,7 @@ jobs: # --- Docs build (every event; never publishes) ------------------------------ docs: - uses: DiamondLightSource/myst-version-switcher-plugin/.github/workflows/docs.yml@v0.18.0 + uses: DiamondLightSource/myst-version-switcher-plugin/.github/workflows/docs.yml@v0.22.0 with: # `make docs` reads build settings (incl. MYSTMD_VERSION) from CONFIG; docs.yml # sets BASE_URL and packs/uploads the docs.zip artifact. @@ -51,7 +51,7 @@ jobs: release: needs: [lint, test, docs] if: github.ref_type == 'tag' - uses: DiamondLightSource/myst-version-switcher-plugin/.github/workflows/release.yml@v0.18.0 + uses: DiamondLightSource/myst-version-switcher-plugin/.github/workflows/release.yml@v0.22.0 permissions: contents: write # create the GitHub Release + attach assets diff --git a/.github/workflows/publish-dispatch.yml b/.github/workflows/publish-dispatch.yml index a0374cc..a735925 100644 --- a/.github/workflows/publish-dispatch.yml +++ b/.github/workflows/publish-dispatch.yml @@ -26,7 +26,7 @@ on: jobs: publish: - uses: DiamondLightSource/myst-version-switcher-plugin/.github/workflows/publish.yml@v0.18.0 + uses: DiamondLightSource/myst-version-switcher-plugin/.github/workflows/publish.yml@v0.22.0 with: version-name: ${{ inputs.version-name }} # "" on dispatch → pure durable gather pr: ${{ inputs.pr }} # set (dispatch only) → pin that fork head SHA diff --git a/docs/myst.yml b/docs/myst.yml index d6c2b8c..828c3d0 100644 --- a/docs/myst.yml +++ b/docs/myst.yml @@ -3,7 +3,7 @@ project: title: PandABlocks-server github: https://github.com/PandABlocks/PandABlocks-server plugins: - - https://github.com/DiamondLightSource/myst-version-switcher-plugin/releases/download/v0.18.0/version-switcher.mjs + - https://github.com/DiamondLightSource/myst-version-switcher-plugin/releases/download/v0.22.0/version-switcher.mjs # Cross-repository references (mystmd xref + Sphinx intersphinx). # PROTOTYPE for upstreaming into the DLS python-copier-template (Stage A spec §6). # From 7a0847a18aec64ee24ff055449a9e200993418e9 Mon Sep 17 00:00:00 2001 From: Tom Cobb Date: Fri, 3 Jul 2026 15:49:50 +0000 Subject: [PATCH 2/2] CI: forward retry-until through the publish-dispatch shim v0.22.0 added an auto-retry for a wedged Pages origin: publish.yml's re-dispatch job now always re-fires the shim with -f retry-until=..., which 422s unless the shim's workflow_dispatch declares and forwards that input. Bring the shim in line with the plugin's own dogfooded publish-dispatch.yml. --- .github/workflows/publish-dispatch.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.github/workflows/publish-dispatch.yml b/.github/workflows/publish-dispatch.yml index a735925..af85115 100644 --- a/.github/workflows/publish-dispatch.yml +++ b/.github/workflows/publish-dispatch.yml @@ -23,6 +23,12 @@ on: description: External fork PR number to approve (pins its head SHA) and preview. Leave empty to just re-deploy. required: false default: "" + retry-until: + description: >- + Internal — epoch-seconds deadline for auto-retrying a wedged Pages origin. + Don't set manually. + required: false + default: "" jobs: publish: @@ -31,6 +37,7 @@ jobs: version-name: ${{ inputs.version-name }} # "" on dispatch → pure durable gather pr: ${{ inputs.pr }} # set (dispatch only) → pin that fork head SHA dispatch-workflow: publish-dispatch.yml # the file the tag re-dispatch re-fires + retry-until: ${{ inputs.retry-until }} # "" on workflow_call/no-retry dispatch → no auto-retry permissions: contents: read actions: write # publish.yml's re-dispatch job re-fires this shim via gh