Merge branch 'master' into noa/unconflate-budget-and-energy

Author: coolreader18

.cargo/config.toml

@@ -5,6 +5,7 @@ rustflags = ["--cfg", "tokio_unstable"]
 bump-versions = "run -p upgrade-version --"
 llm = "run --package xtask-llm-benchmark --bin llm_benchmark --"
 ci = "run -p ci --"
+regen = "run -p regen --"
 smoketest = "ci smoketests --"
 smoketests = "smoketest"
 lint = "ci lint --"

.github/actions/setup-pnpm/action.yml

@@ -0,0 +1,20 @@
+name: Set up pnpm
+description: Install pnpm and configure repository package-age policy before any install
+inputs:
+  run_install:
+    description: Run pnpm install after configuring pnpm
+    required: false
+    default: "false"
+runs:
+  using: composite
+  steps:
+    - uses: pnpm/action-setup@v4
+
+    - name: Configure pnpm package age policy
+      shell: bash
+      run: pnpm config set --global minimumReleaseAge 1440
+
+    - name: Install dependencies
+      if: inputs.run_install == 'true'
+      shell: bash
+      run: pnpm install

.github/workflows/attach-artifacts.yml

@@ -17,10 +17,10 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Download artifacts from private base URL
+      - name: Download artifacts from AWS base URL
         env:
           RELEASE_TAG: ${{ github.event.inputs.release_tag }}
-          BASE_URL: ${{ secrets.ARTIFACT_BASE_URL }}
+          BASE_URL: https://${{ vars.AWS_BUCKET }}.s3.amazonaws.com/refs/tags
         run: |
           set -euo pipefail
 

.github/workflows/benchmarks.yml

@@ -2,7 +2,6 @@ on:
   push:
     branches:
       - master
-      - jgilles/fix-callgrind-again
 
   workflow_dispatch:
     inputs:
@@ -24,8 +23,10 @@ jobs:
   benchmark:
     name: run criterion benchmarks
     runs-on: benchmarks-runner
+    # disable until we fix the benchmarks
+    if: false
     # filter for a comment containing 'benchmarks please'
-    if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
+    #if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
     env:
       PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
     steps:
@@ -185,8 +186,10 @@ jobs:
     container:
       image: rust:1.93.0
       options: --privileged
+    # disable until we fix the benchmarks
+    if: false
     # filter for a comment containing 'benchmarks please'
-    if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
+    #if: ${{ github.event_name != 'issue_comment' || (github.event.issue.pull_request && contains(github.event.comment.body, 'benchmarks please')) }}
     env:
       PR_NUMBER: ${{ github.event.inputs.pr_number || github.event.issue.number || null }}
     steps:

.github/workflows/ci.yml

@@ -80,7 +80,7 @@ jobs:
         with:
           node-version: 18
 
-      - uses: pnpm/action-setup@v4
+      - uses: ./.github/actions/setup-pnpm
         with:
           run_install: true
 
@@ -221,7 +221,7 @@ jobs:
         with:
           node-version: 22
 
-      - uses: pnpm/action-setup@v4
+      - uses: ./.github/actions/setup-pnpm
         with:
           run_install: true
 
@@ -297,7 +297,7 @@ jobs:
         with:
           node-version: 22
 
-      - uses: pnpm/action-setup@v4
+      - uses: ./.github/actions/setup-pnpm
         with:
           run_install: true
 
@@ -524,7 +524,7 @@ jobs:
         with:
           node-version: 22
 
-      - uses: pnpm/action-setup@v4
+      - uses: ./.github/actions/setup-pnpm
         with:
           run_install: true
 
@@ -558,39 +558,6 @@ jobs:
         run: |
           cargo ci cli-docs
 
-  llm_ci_check:
-    name: Verify LLM benchmark is up to date
-    permissions:
-      contents: read
-    runs-on: ubuntu-latest
-    # Disable the tests because they are causing us headaches with merge conflicts and re-runs etc.
-    if: false
-    steps:
-      # Build the tool from master to ensure consistent hash computation
-      # with the llm-benchmark-update workflow (which also uses master's tool).
-      - name: Checkout master (build tool from trusted code)
-        uses: actions/checkout@v4
-        with:
-          ref: master
-          fetch-depth: 1
-
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@v2
-
-      - name: Install llm-benchmark tool from master
-        run: |
-          cargo install --path tools/xtask-llm-benchmark --locked
-          command -v llm_benchmark
-
-      # Now checkout the PR branch to verify its benchmark files
-      - name: Checkout PR branch
-        uses: actions/checkout@v4
-        with:
-          clean: false
-
-      - name: Run hash check (both langs)
-        run: llm_benchmark ci-check
-
   unity-testsuite:
     needs: [lints]
     # Skip if this is an external contribution.
@@ -689,7 +656,7 @@ jobs:
           }
 
       - name: Hydrate Unity SDK DLLs
-        run: cargo ci dlls
+        run: cargo regen csharp dlls
 
       - name: Check Unity meta files
         uses: DeNA/unity-meta-check@v3
@@ -722,12 +689,6 @@ jobs:
           key: Unity-${{ github.head_ref }}
           restore-keys: Unity-
 
-      - name: Login to DockerHub
-        uses: docker/login-action@v2
-        with:
-          username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
-
       - name: Run Unity tests
         uses: game-ci/unity-test-runner@v4
         with:
@@ -780,7 +741,7 @@ jobs:
 
       - name: Run .NET tests
         working-directory: sdks/csharp
-        run: dotnet test -warnaserror --no-restore
+        run: dotnet test -warnaserror --no-restore SpacetimeDB.ClientSDK.csproj
 
       - name: Verify C# formatting
         working-directory: sdks/csharp
@@ -830,10 +791,9 @@ jobs:
           ln -sf $CARGO_HOME/bin/spacetimedb-cli $CARGO_HOME/bin/spacetime
 
       - name: Check quickstart-chat bindings are up to date
-        working-directory: sdks/csharp
         run: |
-          bash tools~/gen-quickstart.sh
-          "${GITHUB_WORKSPACE}"/tools/check-diff.sh examples~/quickstart-chat || {
+          bash sdks/csharp/tools~/gen-quickstart.sh
+          tools/check-diff.sh templates/chat-console-cs/module_bindings || {
               echo 'Error: quickstart-chat bindings have changed. Please run `sdks/csharp/tools~/gen-quickstart.sh`.'
               exit 1
           }
@@ -889,14 +849,18 @@ jobs:
             const publicRef = (context.eventName === 'pull_request') ? context.payload.pull_request.head.ref : context.sha;
             const publicPrNumber = context.payload.pull_request?.number ?? context.payload.inputs?.pr_number;
             const preDispatch = new Date().toISOString();
+            const inputs = { public_ref: publicRef };
+            if (publicPrNumber) {
+              inputs.public_pr_number = String(publicPrNumber);
+            }
 
             // Dispatch the workflow in the target repository
             await github.rest.actions.createWorkflowDispatch({
               owner: targetOwner,
               repo: targetRepo,
               workflow_id: workflowId,
               ref: targetRef,
-              inputs: { public_ref: publicRef, public_pr_number: String(publicPrNumber) }
+              inputs,
             });
   
             const sleep = (ms) => new Promise(r => setTimeout(r, ms));
@@ -1093,7 +1057,7 @@ jobs:
         with:
           node-version: '22'
 
-      - uses: pnpm/action-setup@v4
+      - uses: ./.github/actions/setup-pnpm
         with:
           run_install: true
 
@@ -1130,7 +1094,7 @@ jobs:
         with:
           node-version: 22
 
-      - uses: pnpm/action-setup@v4
+      - uses: ./.github/actions/setup-pnpm
         with:
           run_install: true
 
@@ -1228,3 +1192,24 @@ jobs:
       # - name: Print rows in the user table
       #   if: always()
       #   run: spacetime sql quickstart-chat "SELECT * FROM user"
+
+  version_upgrade_check:
+    runs-on: spacetimedb-new-runner-2
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - uses: dsherret/rust-toolchain-file@v1
+      - name: Set default rust toolchain
+        run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
+      # pnpm is required for regenerating the typescript bindings
+      - name: Set up Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - uses: ./.github/actions/setup-pnpm
+        with:
+          run_install: true
+      - name: Verify that upgrade-version still works
+        run: cargo ci version-upgrade-check
+      - name: Show diff
+        run: git diff HEAD

.github/workflows/docker.yml

@@ -40,7 +40,8 @@ jobs:
         uses: docker/login-action@v2
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          # Docker Hub access tokens are passed to docker/login-action via the password input.
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v4
         with:
@@ -101,7 +102,8 @@ jobs:
         uses: docker/login-action@v2
         with:
           username: ${{ vars.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+          # Docker Hub access tokens are passed to docker/login-action via the password input.
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
       - name: Build and push
         uses: docker/build-push-action@v4
         with:

.github/workflows/docs-publish.yaml

@@ -20,7 +20,7 @@ jobs:
         with:
           node-version: '22'
 
-      - uses: pnpm/action-setup@v4
+      - uses: ./.github/actions/setup-pnpm
         with:
           run_install: true
 

.github/workflows/docs-update-llms.yaml

@@ -0,0 +1,67 @@
+name: Docs / Update llms files
+
+permissions:
+  contents: write
+
+on:
+  push:
+    branches:
+      - docs/release
+    paths:
+      - 'docs/docs/**'
+      - 'skills/**'
+  workflow_dispatch: # Allow manual trigger
+
+jobs:
+  update-llms:
+    runs-on: spacetimedb-new-runner-2
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+        with:
+          ref: docs/release
+
+      - name: Set up Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '22'
+
+      - uses: ./.github/actions/setup-pnpm
+        with:
+          run_install: true
+
+      - name: Get pnpm store directory
+        working-directory: sdks/typescript
+        shell: bash
+        run: |
+          echo "STORE_PATH=$(pnpm store path --silent)" >> $GITHUB_ENV
+
+      - uses: actions/cache@v4
+        name: Setup pnpm cache
+        with:
+          path: ${{ env.STORE_PATH }}
+          key: ${{ runner.os }}-pnpm-store-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-store-
+
+      - name: Install dependencies
+        working-directory: docs
+        run: pnpm install
+
+      - name: Docusaurus build
+        working-directory: docs
+        run: pnpm build
+
+      - name: Generate llms files
+        working-directory: docs
+        run: node scripts/generate-llms.mjs
+
+      - name: Commit updated llms files
+        working-directory: docs
+        run: |
+          git config user.name "github-actions[bot]"
+          git config user.email "github-actions[bot]@users.noreply.github.com"
+          git add static/llms.md
+          git diff --staged --quiet && echo "No changes" && exit 0
+          git commit -m "Update llms files from docs build"
+          git push