Merge 0711a683bd into e2b2e56bd2

Co-authored-by: Richard van der Hoff <1389908+richvdh@users.noreply.github.com>

.github/workflows/release.yaml

@@ -12,6 +12,9 @@ jobs:
     defaults:
       run:
         working-directory: packages/npm
+    permissions:
+      contents: read
+      id-token: write
     steps:
       - name: 🧮 Checkout code
         uses: actions/checkout@v4
@@ -23,6 +26,10 @@ jobs:
           cache-dependency-path: packages/npm/yarn.lock
           registry-url: "https://registry.npmjs.org"
 
+      # Ensure npm 11.5.1 or later is installed
+      - name: Update npm
+        run: npm install -g npm@latest
+
       - name: 🔨 Install dependencies
         run: "yarn install --frozen-lockfile"
 
@@ -33,10 +40,4 @@ jobs:
           VERSION: ${{ github.event.release.tag_name }}.0
 
       - name: 🚀 Publish to npm
-        id: npm-publish
+        run: npm publish --provenance --access public --tag latest
-        uses: JS-DevTools/npm-publish@19c28f1ef146469e409470805ea4279d47c3d35c # v3.1.1
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-          package: packages/npm
-          access: public
-          ignore-scripts: false

changelogs/internal/newsfragments/2239.clarification

@@ -0,0 +1 @@
+Use NPM Trusted Publishers for publishing `@matrix-org/spec` to npm.

content/olm-megolm/_index.md

@@ -4,9 +4,7 @@ weight: 61
 type: docs
 ---
 
-The Olm and Megolm cryptographic ratchets are not formally part
+Matrix uses the Olm and Megolm cryptographic ratchets for [end-to-end encryption](../client-server-api/#end-to-end-encryption).
-of the Matrix specification. In lack of a better place, their
-specification is reproduced here, regardless.
 
 -   [Olm: A Cryptographic Ratchet](/olm-megolm/olm/)
 -   [Megolm group ratchet](/olm-megolm/megolm/)

scripts/download-katex-assets.sh

@@ -1,8 +1,9 @@
 #!/bin/bash
-
+#
+# Download the KaTeX fonts and CSS, and copy them into `static`.
 set -e
 
-root=$(git rev-parse --show-toplevel)
+root=$(dirname "$0")/..
 
 # Check that the caller supplied a version.
 version=$1
@@ -35,6 +36,6 @@ install -vm644 "$tmp_dir/katex/katex.min.css" "$root/static/css/katex.min.css"
 
 # Remove any existing fonts and move the new ones into place.
 rm -rvf "$root"/static/css/fonts/KaTeX*
-while read -r file; do
+while IFS= read -r -d '' file; do
     install -vm644 "$file" "$root/static/css/fonts"
-done < <(find "$tmp_dir/katex/fonts" -maxdepth 1 -name "KaTeX*.woff2")
+done < <(find "$tmp_dir/katex/fonts" -maxdepth 1 -name "KaTeX*.woff2" -print0)