Merge 7fa012b67f into 967b54195c

.github/workflows/release.yaml

@@ -12,9 +12,6 @@ jobs:
     defaults:
       run:
         working-directory: packages/npm
-    permissions:
-      contents: read
-      id-token: write
     steps:
       - name: 🧮 Checkout code
         uses: actions/checkout@v4
@@ -26,10 +23,6 @@ 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"
 
@@ -40,4 +33,10 @@ jobs:
           VERSION: ${{ github.event.release.tag_name }}.0
 
       - name: 🚀 Publish to npm
-        run: npm publish --provenance --access public --tag latest
+        id: npm-publish
+        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

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

content/olm-megolm/_index.md

@@ -4,7 +4,9 @@ weight: 61
 type: docs
 ---
 
-Matrix uses the Olm and Megolm cryptographic ratchets for [end-to-end encryption](../client-server-api/#end-to-end-encryption).
+The Olm and Megolm cryptographic ratchets are not formally part
+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,9 +1,8 @@
 #!/bin/bash
-#
-# Download the KaTeX fonts and CSS, and copy them into `static`.
+
 set -e
 
-root=$(dirname "$0")/..
+root=$(git rev-parse --show-toplevel)
 
 # Check that the caller supplied a version.
 version=$1
@@ -36,6 +35,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 IFS= read -r -d '' file; do
+while read -r file; do
     install -vm644 "$file" "$root/static/css/fonts"
-done < <(find "$tmp_dir/katex/fonts" -maxdepth 1 -name "KaTeX*.woff2" -print0)
+done < <(find "$tmp_dir/katex/fonts" -maxdepth 1 -name "KaTeX*.woff2")