Merge branch 'master' into bfops/use-new-internal-tests

Author: bfops

.github/workflows/ci.yml

@@ -102,10 +102,6 @@ jobs:
           cd $env:USERPROFILE\emsdk
           .\emsdk install 4.0.21
           .\emsdk activate 4.0.21
-          # Add emscripten to PATH for subsequent steps and subprocesses
-          $emsdkPath = "$env:USERPROFILE\emsdk\upstream\emscripten"
-          Add-Content -Path $env:GITHUB_PATH -Value $emsdkPath
-          Write-Host "Added $emsdkPath to PATH"
 
       - name: Install psql (Windows)
         if: runner.os == 'Windows'
@@ -342,24 +338,8 @@ jobs:
       - uses: dsherret/rust-toolchain-file@v1
       - name: Set default rust toolchain
         run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
-      - name: Set up Python env
-        run: |
-          test -d venv || python3 -m venv venv
-          venv/bin/pip3 install argparse toml
       - name: Run checks
-        run: |
-          set -ueo pipefail
-          FAILED=0
-          ROOTS=(spacetimedb spacetimedb-sdk)
-          CRATES=$(venv/bin/python3 tools/find-publish-list.py --recursive --directories --quiet "${ROOTS[@]}")
-          for crate_dir in $CRATES; do
-            if ! venv/bin/python3 tools/crate-publish-checks.py "${crate_dir}"; then
-              FAILED=$(( $FAILED + 1 ))
-            fi
-          done
-          if [ $FAILED -gt 0 ]; then
-            exit 1
-          fi
+        run: cargo ci publish-checks
 
   update:
     name: Test spacetimedb-update flow (${{ matrix.target }})
@@ -389,28 +369,10 @@ jobs:
         shell: bash
         run: sudo apt install -y libssl-dev
 
-      - name: Build spacetimedb-update
-        run: cargo build --features github-token-auth --target ${{ matrix.target }} -p spacetimedb-update
-        if: runner.os == 'Windows'
-
-      - name: Run self-install
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        shell: bash
-        run: |
-          ROOT_DIR="$(mktemp -d)"
-          # NOTE(bfops): We need the `github-token-auth` feature because we otherwise tend to get ratelimited when we try to fetch `/releases/latest`.
-          # My best guess is that, on the GitHub runners, the "anonymous" ratelimit is shared by *all* users of that runner (I think this because it
-          # 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
-        if: runner.os == 'Windows'
-
       - name: Test spacetimedb-update
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         run: cargo ci update-flow --target=${{ matrix.target }} --github-token-auth
-        if: runner.os != 'Windows'
 
   unreal_engine_tests:
     name: Unreal Engine Tests
@@ -1179,13 +1141,12 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Install dependencies
-        working-directory: docs
-        run: pnpm install
+      - uses: dsherret/rust-toolchain-file@v1
+      - name: Set default rust toolchain
+        run: rustup default $(rustup show active-toolchain | cut -d' ' -f1)
 
       - name: Docusaurus build
-        working-directory: docs
-        run: pnpm build
+        run: cargo ci docs
 
   typescript-test:
     name: TypeScript - Tests
@@ -1217,14 +1178,6 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-pnpm-store-
 
-      - name: Build module library and SDK
-        working-directory: crates/bindings-typescript
-        run: pnpm build
-
-      - name: Run module library and SDK tests
-        working-directory: crates/bindings-typescript
-        run: pnpm test
-
       # - name: Extract SpacetimeDB branch name from file
       #   id: extract-branch
       #   run: |
@@ -1264,76 +1217,38 @@ jobs:
           save-if: false
           prefix-key: v1
 
-      # This step shouldn't be needed, but somehow we end up with caches that are missing librusty_v8.a.
-      # ChatGPT suspects that this could be due to different build invocations using the same target dir,
-      # and this makes sense to me because we only see it in this job where we mix `cargo build -p` with
-      # `cargo build --manifest-path` (which apparently build different dependency trees).
-      # 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
-          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."
-            cargo clean --release -p v8 || true
-            cargo build --release -p v8
-          fi
-
-      - name: Install SpacetimeDB CLI from the local checkout
-        run: |
-          export CARGO_HOME="$HOME/.cargo"
-          echo "$CARGO_HOME/bin" >> "$GITHUB_PATH"
-          cargo install --force --path crates/cli --locked --message-format=short
-          cargo install --force --path crates/standalone --locked --message-format=short
-          # Add a handy alias using the old binary name, so that we don't have to rewrite all scripts (incl. in submodules).
-          ln -sf $CARGO_HOME/bin/spacetimedb-cli $CARGO_HOME/bin/spacetime
-          # Clear any existing information
-          spacetime server clear -y
-
-      - name: Generate client bindings
-        working-directory: templates/chat-react-ts
-        run: |
-          pnpm generate
-
-      - name: Check for changes
-        working-directory: templates/chat-react-ts
-        run: |
-          "${GITHUB_WORKSPACE}"/tools/check-diff.sh src/module_bindings || {
-            echo "Error: Bindings are dirty. Please generate bindings again and commit them to this branch."
-            exit 1
-          }
-
-      # - name: Start SpacetimeDB
+      # # This step shouldn't be needed, but somehow we end up with caches that are missing librusty_v8.a.
+      # # ChatGPT suspects that this could be due to different build invocations using the same target dir,
+      # # and this makes sense to me because we only see it in this job where we mix `cargo build -p` with
+      # # `cargo build --manifest-path` (which apparently build different dependency trees).
+      # # However, we've been unable to fix it so... /shrug
+      # - name: Check v8 outputs
       #   run: |
-      #     spacetime start &
-      #     disown
-
-      # - name: Publish module to SpacetimeDB
-      #   working-directory: SpacetimeDB/templates/quickstart-chat-typescript/spacetimedb
-      #   run: |
-      #     spacetime logout && spacetime login --server-issued-login local
-      #     spacetime publish -s local quickstart-chat -c -y
+      #     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
+      #     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."
+      #       cargo clean --release -p v8 || true
+      #       cargo build --release -p v8
+      #     fi
 
-      # - name: Publish module to SpacetimeDB
-      #   working-directory: SpacetimeDB/templates/quickstart-chat-typescript/spacetimedb
+      # - name: Install SpacetimeDB CLI from the local checkout
       #   run: |
-      #     spacetime logs quickstart-chat
-
-      - name: Check that quickstart-chat builds
-        working-directory: templates/chat-react-ts
-        run: pnpm build
-
-      - name: Check that templates build
-        working-directory: templates/
-        run: pnpm -r --filter "./**" run build
-
-      - name: Check that subdirectories build
-        working-directory: crates/bindings-typescript
-        run: pnpm -r --filter "./**" run build
+      #     export CARGO_HOME="$HOME/.cargo"
+      #     echo "$CARGO_HOME/bin" >> "$GITHUB_PATH"
+      #     cargo install --force --path crates/cli --locked --message-format=short
+      #     cargo install --force --path crates/standalone --locked --message-format=short
+      #     # Add a handy alias using the old binary name, so that we don't have to rewrite all scripts (incl. in submodules).
+      #     ln -sf $CARGO_HOME/bin/spacetimedb-cli $CARGO_HOME/bin/spacetime
+      #     # Clear any existing information
+      #     spacetime server clear -y
+
+      - name: Run TypeScript tests
+        run: cargo ci typescript-test
 
       # - name: Run quickstart-chat tests
       #   working-directory: examples/quickstart-chat

Cargo.lock

@@ -156,8 +156,8 @@ arrayvec = "0.7.2"
 async-channel = "2.5"
 async-stream = "0.3.6"
 async-trait = "0.1.68"
-axum = { version = "0.8.4", features = ["tracing"] }
-axum-extra = { version = "0.10", features = ["typed-header"] }
+axum = { version = "0.7", features = ["tracing"] }
+axum-extra = { version = "0.9", features = ["typed-header"] }
 backtrace = "0.3.66"
 base64 = "0.21.2"
 bigdecimal = "0.4.7"

Cargo.toml

@@ -1,12 +1,9 @@
 #ifndef SPACETIMEDB_RUNTIME_REGISTRATION_H
 #define SPACETIMEDB_RUNTIME_REGISTRATION_H
 
-#include <atomic>
 #include <functional>
 #include <optional>
 #include <string>
-#include <type_traits>
-#include <utility>
 #include <vector>
 #include "../abi/opaque_types.h"
 #include "autogen/Lifecycle.g.h"
@@ -36,18 +33,6 @@ std::vector<uint8_t> ConsumeBytes(BytesSource source);
 void SetMultiplePrimaryKeyError(const std::string& table_name);
 void SetConstraintRegistrationError(const std::string& code, const std::string& details);
 
-template <typename F>
-__attribute__((noinline)) decltype(auto) __spacetimedb_begin_short_backtrace(F&& f) {
-    if constexpr (std::is_void_v<std::invoke_result_t<F>>) {
-        std::forward<F>(f)();
-        std::atomic_signal_fence(std::memory_order_seq_cst);
-    } else {
-        decltype(auto) result = std::forward<F>(f)();
-        std::atomic_signal_fence(std::memory_order_seq_cst);
-        return result;
-    }
-}
-
 } // namespace Internal
 } // namespace SpacetimeDB