merge master into add/cargo-ci

Author: Kasama

.cargo/config.toml

@@ -4,3 +4,10 @@ rustflags = ["--cfg", "tokio_unstable"]
 [alias]
 bump-versions = "run -p upgrade-version --"
 ci = "run -p ci --"
+
+[target.x86_64-pc-windows-msvc]
+# Use a different linker. Otherwise, the build fails with some obscure linker error that
+# seems to be a result of us producing a massive PDB file.
+# I (@bfops) tried a variety of other link options besides switching linkers, but this
+# seems to be the only thing that worked.
+linker = "lld-link"

.github/workflows/benchmarks.yml

@@ -183,7 +183,7 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 20 # on a successful run, runs in 8 minutes
     container:
-      image: rust:1.88.0
+      image: rust:1.90.0
       options: --privileged
     # 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')) }}

.github/workflows/ci.yml

@@ -58,12 +58,6 @@ jobs:
           $ErrorActionPreference = 'Stop'
           $PSNativeCommandUseErrorActionPreference = $true
 
-          # Use a different linker. Otherwise, the build fails with some obscure linker error that
-          # seems to be a result of us producing a massive PDB file.
-          # I (@bfops) tried a variety of other link options besides switching linkers, but this
-          # seems to be the only thing that worked.
-          $env:RUSTFLAGS='-Clinker=lld-link'
-
           cargo build -p spacetimedb-cli -p spacetimedb-standalone -p spacetimedb-update
           Start-Process target/debug/spacetimedb-cli.exe -ArgumentList 'start --pg-port 5432'
           cd modules

.github/workflows/csharp-test.yml

@@ -83,15 +83,20 @@ jobs:
           CARGO_TARGET_DIR: demo/Blackholio/server-rust/target
 
       - name: Check quickstart-chat bindings are up to date
-        working-directory: sdks/csharp/examples~/quickstart-chat
+        working-directory: sdks/csharp
         run: |
-          bash ../../tools~/gen-quickstart.sh "${GITHUB_WORKSPACE}"
-          # This was copied from tools/check-diff.sh.
-          # It's required because `spacetime generate` creates lines with the SpacetimeDB commit
-          # version, which would make this `git diff` check very brittle if included.
-          PATTERN='^// This was generated using spacetimedb cli version.*'
-          git diff --exit-code --ignore-matching-lines="$PATTERN" -- . || {
-              echo "Error: quickstart-chat bindings have changed. Please regenerate the bindings and commit them to this branch."
+          bash tools~/gen-quickstart.sh
+          "${GITHUB_WORKSPACE}"/tools/check-diff.sh examples~/quickstart-chat || {
+              echo 'Error: quickstart-chat bindings have changed. Please run `sdks/csharp/tools~/gen-quickstart.sh`.'
+              exit 1
+          }
+
+      - name: Check client-api bindings are up to date
+        working-directory: sdks/csharp
+        run: |
+          bash tools~/gen-client-api.sh
+          "${GITHUB_WORKSPACE}"/tools/check-diff.sh src/SpacetimeDB/ClientApi || {
+              echo 'Error: Client API bindings are dirty. Please run `sdks/csharp/tools~/gen-client-api.sh`.'
               exit 1
           }
 
@@ -101,12 +106,8 @@ jobs:
 
       - name: Check for changes
         run: |
-          # This was copied from tools/check-diff.sh.
-          # It's required because `spacetime generate` creates lines with the SpacetimeDB commit
-          # version, which would make this `git diff` check very brittle if included.
-          PATTERN='^// This was generated using spacetimedb cli version.*'
-          git diff --exit-code --ignore-matching-lines="$PATTERN" -- demo/Blackholio/client-unity/Assets/Scripts/autogen || {
-              echo "Error: Bindings are dirty. Please generate bindings again and commit them to this branch."
+          tools/check-diff.sh demo/Blackholio/client-unity/Assets/Scripts/autogen || {
+              echo 'Error: Bindings are dirty. Please run `demo/Blackholio/server-rust/generate.sh`.'
               exit 1
           }
 
@@ -124,7 +125,12 @@ jobs:
           disown
 
       - name: Run regression tests
-        run: bash sdks/csharp/tools~/run-regression-tests.sh .
+        run: |
+          bash sdks/csharp/tools~/run-regression-tests.sh
+          tools/check-diff.sh sdks/csharp/examples~/regression-tests || {
+              echo 'Error: Bindings are dirty. Please run `sdks/csharp/tools~/gen-regression-tests.sh`.'
+              exit 1
+          }
 
       - name: Publish unity-tests module to SpacetimeDB
         working-directory: demo/Blackholio/server-rust

.github/workflows/typescript-test.yml

@@ -77,7 +77,9 @@ jobs:
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
         with:
-          workspaces: modules/quickstart-chat
+          workspaces: |
+            .
+            modules/quickstart-chat
           shared-key: quickstart-chat-test
 
       - name: Install SpacetimeDB CLI from the local checkout
@@ -89,9 +91,6 @@ jobs:
           ln -s $HOME/.cargo/bin/spacetimedb-cli $HOME/.cargo/bin/spacetime
           # Clear any existing information
           spacetime server clear -y
-        env:
-          # Share the target directory with our local project to avoid rebuilding same SpacetimeDB crates twice.
-          CARGO_TARGET_DIR: modules/quickstart-chat/target
 
       - name: Generate client bindings
         working-directory: modules/quickstart-chat
@@ -103,14 +102,10 @@ jobs:
       - name: Check for changes
         working-directory: crates/bindings-typescript
         run: |
-          # This was copied from SpacetimeDB/tools/check-diff.sh.
-          # It's required because `spacetime generate` creates lines with the SpacetimeDB commit
-          # version, which would make this `git diff` check very brittle if included.
-          PATTERN='^// This was generated using spacetimedb cli version.*'
-          if ! git diff --exit-code --ignore-matching-lines="$PATTERN" -- examples/quickstart-chat/src/module_bindings; then
+          "${GITHUB_WORKSPACE}"/tools/check-diff.sh examples/quickstart-chat/src/module_bindings || {
             echo "Error: Bindings are dirty. Please generate bindings again and commit them to this branch."
             exit 1
-          fi
+          }
 
       # - name: Start SpacetimeDB
       #   run: |

Cargo.lock

@@ -96,7 +96,7 @@ debug = true
 version = "1.5.0"
 edition = "2021"
 # update rust-toolchain.toml too!
-rust-version = "1.88.0"
+rust-version = "1.90.0"
 
 [workspace.dependencies]
 spacetimedb = { path = "crates/bindings", version = "=1.5.0" }
@@ -183,6 +183,7 @@ fs_extra = "1.3.0"
 fs2 = "0.4.3"
 futures = "0.3"
 futures-channel = "0.3"
+futures-util = "0.3"
 getrandom02 = { package = "getrandom", version = "0.2" }
 glob = "0.3.1"
 hashbrown = { version = "0.15", default-features = false, features = ["equivalent", "inline-more"] }
@@ -313,6 +314,7 @@ version = "25"
 default-features = false
 features = [
   "addr2line",
+  "async",
   "cache",
   "cranelift",
   "demangle",
@@ -342,3 +344,11 @@ unexpected_cfgs = { level = "warn", check-cfg = ['cfg(tokio_unstable)'] }
 [workspace.lints.clippy]
 # FIXME: we should work on this lint incrementally
 result_large_err = "allow"
+
+[patch.crates-io]
+# Note(bfops): We require this override because temporal_rs (pulled via core->v8->ry_temporal_capi)
+# depends on timezone_provider using a `~` which allows a roll-forward to an incompatible version.
+# Maybe this will no longer be an issue if we bump v8 to a version that depends on a post-0.1
+# version of temporal_rs, but I'm not holding my breath.
+timezone_provider = { git = "https://github.com/boa-dev/temporal", tag = "v0.0.11" }
+temporal_rs = { git = "https://github.com/boa-dev/temporal", tag = "v0.0.11" }

Cargo.toml

@@ -3,7 +3,7 @@
 # See the README for commands to run.
 
 # sync with: ../../rust-toolchain.toml
-FROM rust:1.88.0
+FROM rust:1.90.0
 
 RUN apt-get update && \
     apt-get install -y valgrind bash && \

crates/bench/Dockerfile

@@ -408,6 +408,7 @@ mod callgrind_benches {
     // ========================= FIND =========================
 
     #[derive(Deserialize)]
+    #[expect(unused)] // TODO
     struct FindBenchmark<DB: BenchDatabase, T: BenchTable + RandomTable> {
         bench: String,
         db: String,

crates/bench/benches/callgrind.rs

@@ -72,6 +72,11 @@ public class NoSpaceException : StdbException
     public override string Message => "The provided bytes sink has no more room left";
 }
 
+public class AutoIncOverflowException : StdbException
+{
+    public override string Message => "The auto-increment sequence overflowed";
+}
+
 public class UnknownException : StdbException
 {
     private readonly Errno code;