Merge branch 'master' into jdetter/login-and-resume-gameplay

Author: jdetter

.github/workflows/bottest.yml

@@ -236,3 +236,41 @@ jobs:
           # happens very frequently on the `macos-runner`, but we haven't seen it on any others).
           cargo run --features github-token-auth --target ${{ matrix.target }} -p spacetimedb-update -- self-install --root-dir="${ROOT_DIR}" --yes
           "${ROOT_DIR}"/spacetime --root-dir="${ROOT_DIR}" help
+
+  cli_docs:
+    name: Check CLI docs
+    permissions: read-all
+    runs-on: ubuntu-latest
+    steps:
+      - name: Find Git ref
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        shell: bash
+        run: |
+          PR_NUMBER="${{ github.event.inputs.pr_number || null }}"
+          if test -n "${PR_NUMBER}"; then
+            GIT_REF="$( gh pr view --repo clockworklabs/SpacetimeDB $PR_NUMBER --json headRefName --jq .headRefName )"
+          else
+            GIT_REF="${{ github.ref }}"
+          fi
+          echo "GIT_REF=${GIT_REF}" >>"$GITHUB_ENV"
+      - name: Checkout sources
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ env.GIT_REF }}
+      - uses: dsherret/rust-toolchain-file@v1
+      - name: Check for docs change
+        run: |
+          cargo run --features markdown-docs -p spacetimedb-cli > docs/docs/cli-reference.md
+          cd docs
+          # This is needed because our website doesn't render markdown quite properly.
+          # See the README in docs for more details.
+          sed -i'' -E 's!^(##) `(.*)`$!\1 \2!' docs/cli-reference.md
+          sed -i'' -E 's!^(######) \*\*(.*)\*\*$!\1 <b>\2</b>!' docs/cli-reference.md
+          git status
+          if git diff --exit-code HEAD; then
+            echo "No docs changes detected"
+          else
+            echo "It looks like the CLI docs have changed:"
+            exit 1
+          fi

.github/workflows/bottest_tracing_fix.patch

@@ -9,6 +9,11 @@ on:
 jobs:
   unity-testsuite:
     runs-on: ubuntu-latest
+    # Cancel any previous testsuites running on the same PR and/or ref.
+    concurrency:
+      group: unity-test-${{ github.event.pull_request.number || github.ref }}
+      cancel-in-progress: true
+    timeout-minutes: 30
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: Docs - Validate nav.ts Matches nav.js
+name: Docs - Validate nav.ts
 
 on:
   pull_request:

.github/workflows/csharp-test.yml

@@ -5,6 +5,7 @@ on:
   push:
     branches:
       - master
+  merge_group:
 
 jobs:
   build:

.github/workflows/docs-validate-nav-build.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request:
+  merge_group:
 
 jobs:
   compile-and-test: