Skip to content

Commit 83033a2

Browse files
committed
[bfops/debug-link-error]: Redo fixes
1 parent a388c48 commit 83033a2

4 files changed

Lines changed: 13 additions & 17 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -684,13 +684,6 @@ jobs:
684684
# Let the main CI job save the cache since it builds the most things
685685
save-if: false
686686

687-
- name: Install SpacetimeDB CLI from the local checkout
688-
run: |
689-
cargo install --force --path crates/cli --locked --message-format=short
690-
cargo install --force --path crates/standalone --locked --message-format=short
691-
# Add a handy alias using the old binary name, so that we don't have to rewrite all scripts (incl. in submodules).
692-
ln -sf $CARGO_HOME/bin/spacetimedb-cli $CARGO_HOME/bin/spacetime
693-
694687
- name: Check quickstart-chat bindings are up to date
695688
working-directory: sdks/csharp
696689
run: |
@@ -711,7 +704,7 @@ jobs:
711704
712705
- name: Start SpacetimeDB
713706
run: |
714-
spacetime start &
707+
cargo run -pspacetimedb-cli -- start &
715708
disown
716709
717710
- name: Run regression tests

sdks/csharp/tools~/gen-client-api.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@ SDK_PATH="$(dirname "$0")/.."
66
SDK_PATH="$(realpath "$SDK_PATH")"
77
STDB_PATH="$SDK_PATH/../.."
88

9-
cargo build --manifest-path "$STDB_PATH/crates/standalone/Cargo.toml"
9+
cd "$STDB_PATH"
10+
cargo build -p spacetimedb-standalone
1011

11-
cargo run --manifest-path $STDB_PATH/crates/client-api-messages/Cargo.toml --example get_ws_schema |
12-
cargo run --manifest-path $STDB_PATH/crates/cli/Cargo.toml -- generate -l csharp --namespace SpacetimeDB.ClientApi \
12+
cargo run -p client-api-messages --example get_ws_schema |
13+
cargo run -p spacetimedb-cli -- generate -l csharp --namespace SpacetimeDB.ClientApi \
1314
--module-def \
1415
-o $SDK_PATH/src/SpacetimeDB/ClientApi/.output
1516

sdks/csharp/tools~/gen-quickstart.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,6 @@ SDK_PATH="$(dirname "$0")/.."
66
SDK_PATH="$(realpath "$SDK_PATH")"
77
STDB_PATH="$SDK_PATH/../.."
88

9-
cargo build --manifest-path "$STDB_PATH/crates/standalone/Cargo.toml"
10-
cargo run --manifest-path "$STDB_PATH/crates/cli/Cargo.toml" -- generate -y -l csharp -o "$SDK_PATH/examples~/quickstart-chat/client/module_bindings" --project-path "$SDK_PATH/examples~/quickstart-chat/server"
9+
cd "$STDB_PATH"
10+
cargo build -p spacetimedb-standalone
11+
cargo run -p spacetimedb-cli -- generate -y -l csharp -o "$SDK_PATH/examples~/quickstart-chat/client/module_bindings" --project-path "$SDK_PATH/examples~/quickstart-chat/server"

sdks/csharp/tools~/gen-regression-tests.sh

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ SDK_PATH="$(dirname "$0")/.."
66
SDK_PATH="$(realpath "$SDK_PATH")"
77
STDB_PATH="$SDK_PATH/../.."
88

9-
cargo build --manifest-path "$STDB_PATH/crates/standalone/Cargo.toml"
10-
cargo run --manifest-path "$STDB_PATH/crates/cli/Cargo.toml" -- generate -y -l csharp -o "$SDK_PATH/examples~/regression-tests/client/module_bindings" --project-path "$SDK_PATH/examples~/regression-tests/server"
11-
cargo run --manifest-path "$STDB_PATH/crates/cli/Cargo.toml" -- generate -y -l csharp -o "$SDK_PATH/examples~/regression-tests/republishing/client/module_bindings" --project-path "$SDK_PATH/examples~/regression-tests/republishing/server-republish"
12-
cargo run --manifest-path "$STDB_PATH/crates/cli/Cargo.toml" -- generate -y -l csharp -o "$SDK_PATH/examples~/regression-tests/procedure-client/module_bindings" --project-path "$STDB_PATH/modules/sdk-test-procedure"
9+
cd "$STDB_PATH"
10+
cargo build -p spacetimedb-standalone
11+
cargo run -p spacetimedb-cli -- generate -y -l csharp -o "$SDK_PATH/examples~/regression-tests/client/module_bindings" --project-path "$SDK_PATH/examples~/regression-tests/server"
12+
cargo run -p spacetimedb-cli -- generate -y -l csharp -o "$SDK_PATH/examples~/regression-tests/republishing/client/module_bindings" --project-path "$SDK_PATH/examples~/regression-tests/republishing/server-republish"
13+
cargo run -p spacetimedb-cli -- generate -y -l csharp -o "$SDK_PATH/examples~/regression-tests/procedure-client/module_bindings" --project-path "$STDB_PATH/modules/sdk-test-procedure"

0 commit comments

Comments
 (0)