From d2453f8ef7ef47bae62d6eb2a5f4cde52c3dc2da Mon Sep 17 00:00:00 2001 From: pgherveou Date: Wed, 15 Jul 2026 15:36:34 +0200 Subject: [PATCH] fix(release): unblock post-merge workflows Handle merge-queue PR suffixes when resolving release targets.\nInstall nightly rustfmt wherever post-merge codegen runs. --- .github/workflows/deploy-docs.yml | 1 + .github/workflows/deploy-playground.yml | 1 + .github/workflows/release.yml | 3 +++ 3 files changed, 5 insertions(+) diff --git a/.github/workflows/deploy-docs.yml b/.github/workflows/deploy-docs.yml index 07aad965..8335a8c2 100644 --- a/.github/workflows/deploy-docs.yml +++ b/.github/workflows/deploy-docs.yml @@ -40,6 +40,7 @@ jobs: - uses: dtolnay/rust-toolchain@5b842231ba77f5c045dba54ac5560fed2db780e2 # nightly with: toolchain: nightly + components: rustfmt - name: Install workspace dependencies run: npm ci diff --git a/.github/workflows/deploy-playground.yml b/.github/workflows/deploy-playground.yml index 83c8a1ad..111b0e3a 100644 --- a/.github/workflows/deploy-playground.yml +++ b/.github/workflows/deploy-playground.yml @@ -42,6 +42,7 @@ jobs: - uses: dtolnay/rust-toolchain@5b842231ba77f5c045dba54ac5560fed2db780e2 # nightly with: toolchain: nightly + components: rustfmt - uses: Swatinem/rust-cache@e18b497796c12c097a38f9edb9d0641fb99eee32 # v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e29146f4..d1d0b1ed 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -50,6 +50,8 @@ jobs: run: | set -euo pipefail subject="${RELEASE_COMMIT_MESSAGE%%$'\n'*}" + # Squash merges append " (#)" to the pull request title. + subject="${subject% (#*)}" release="${subject#release: }" name="${release% *}" declared_version="${release##* }" @@ -102,6 +104,7 @@ jobs: uses: dtolnay/rust-toolchain@5b842231ba77f5c045dba54ac5560fed2db780e2 # nightly with: toolchain: nightly + components: rustfmt - if: steps.version.outputs.proceed == 'true' uses: dtolnay/rust-toolchain@5b842231ba77f5c045dba54ac5560fed2db780e2 # stable