[bfops/discord-post-on-merge]: Merge remote-tracking branch 'origin/bfops/use-new-internal-tests' into bfops/discord-post-on-merge

Author: bfops

.github/Dockerfile

@@ -1,5 +1,5 @@
 # Minimal Dockerfile that just wraps pre-built binaries, so we can test the server inside docker
-FROM rust:1.90.0
+FROM rust:1.93.0
 RUN mkdir -p /stdb/data
 COPY ./target/debug/spacetimedb-standalone ./target/debug/spacetimedb-cli /usr/local/bin/
 COPY ./crates/standalone/config.toml /stdb/data/config.toml

.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.90.0
+      image: rust:1.93.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

@@ -52,6 +52,8 @@ jobs:
           ref: ${{ env.GIT_REF }}
 
       - uses: dsherret/rust-toolchain-file@v1
+      - name: Set default rust toolchain
+        run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
 
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
@@ -160,6 +162,8 @@ jobs:
         with:
           ref: ${{ env.GIT_REF }}
       - uses: dsherret/rust-toolchain-file@v1
+      - name: Set default rust toolchain
+        run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
       - name: Cache Rust dependencies
         uses: Swatinem/rust-cache@v2
         with:
@@ -298,12 +302,25 @@ jobs:
         with:
           run_install: true
 
+      # Install cmake and emscripten for C++ module compilation tests.
+      - name: Install cmake and emscripten
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y cmake
+          git clone https://github.com/emscripten-core/emsdk.git ~/emsdk
+          cd ~/emsdk
+          ./emsdk install 4.0.21
+          ./emsdk activate 4.0.21
+
       - name: Build typescript module sdk
         working-directory: crates/bindings-typescript
         run: pnpm build
 
+        # Source emsdk environment to make emcc (Emscripten compiler) available in PATH.
       - name: Run tests
-        run: cargo ci test
+        run: |
+          source ~/emsdk/emsdk_env.sh
+          cargo ci test
 
   lints:
     name: Lints
@@ -845,6 +862,12 @@ jobs:
       # However, we've been unable to fix it so... /shrug
       - name: Check v8 outputs
         run: |
+          find "${CARGO_TARGET_DIR}"/ -type f | grep '[/_]v8' || true
+          if ! [ -f "${CARGO_TARGET_DIR}"/debug/gn_out/obj/librusty_v8.a ]; then
+            echo "Could not find v8 output file librusty_v8.a; rebuilding manually."
+            cargo clean -p v8 || true
+            cargo build -p v8
+          fi
           find "${CARGO_TARGET_DIR}"/ -type f | grep '[/_]v8' || true
           if ! [ -f "${CARGO_TARGET_DIR}"/release/gn_out/obj/librusty_v8.a ]; then
             echo "Could not find v8 output file librusty_v8.a; rebuilding manually."
@@ -916,15 +939,16 @@ jobs:
             const targetRepo = process.env.TARGET_REPO;
             // Use the ref for pull requests because the head sha is brittle (github does some extra dance where it merges in master).
             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();
-  
+
             // 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 }
+              inputs: { public_ref: publicRef, public_pr_number: String(publicPrNumber) }
             });
   
             const sleep = (ms) => new Promise(r => setTimeout(r, ms));

.github/workflows/upgrade-version-check.yml

@@ -21,7 +21,7 @@ jobs:
         with:
           run_install: true
       - name: Verify that upgrade-version still works
-        run: cargo bump-versions 123.456.789 --rust-and-cli --csharp --typescript --accept-snapshots
+        run: cargo bump-versions 123.456.789 --rust-and-cli --csharp --typescript --cpp --accept-snapshots
       - name: Show diff
         run: git diff HEAD
 

.gitignore

@@ -231,6 +231,10 @@ new.json
 # Temporary templates dir for CLI's init command
 /crates/cli/.templates
 
+# C++ build data
+modules/benchmarks-cpp/build/
+modules/module-test-cpp/build/
+
 # Symlinked output from `nix build`
 result
 

Cargo.toml

@@ -106,7 +106,7 @@ debug = true
 version = "1.12.0"
 edition = "2021"
 # update rust-toolchain.toml too!
-rust-version = "1.90.0"
+rust-version = "1.93.0"
 
 [workspace.dependencies]
 spacetimedb = { path = "crates/bindings", version = "=1.12.0" }

crates/bench/Dockerfile

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

crates/bindings-cpp/.gitignore

@@ -0,0 +1 @@
+build*/