Skip to content

Commit 4eb67d2

Browse files
authored
Merge pull request #59 from matrix-org/kegan/build-rust-before-run
Remove compiled rust bindings
2 parents d2cc488 + 5e6d248 commit 4eb67d2

17 files changed

+7
-33261
lines changed

.github/workflows/tests.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,7 @@ jobs:
6969
7070
- name: Build Rust FFI bindings
7171
run: |
72-
sed -i.bak 's/uniffi =.*/uniffi = "0\.25\.3"/' rust-sdk/Cargo.toml
73-
sed -i.bak 's^uniffi_bindgen =.*^uniffi_bindgen = { git = "https:\/\/github.com\/mozilla\/uniffi-rs", rev = "0a03b713306d6ce3de033157fc2ce92a238c2e24" }^' rust-sdk/Cargo.toml
74-
(cd rust-sdk && cargo build -p matrix-sdk-ffi)
75-
ls -alh rust-sdk/target/debug
72+
./install_uniffi_bindgen_go.sh && ./rebuild_rust_sdk.sh ./rust-sdk
7673
7774
# Temporary: as it takes 3m to build the complement synapse image >:(
7875
- name: Pull synapse service v1.94.0 and mitmproxy
@@ -119,7 +116,6 @@ jobs:
119116
run: |
120117
export LIBRARY_PATH="$(pwd)/rust-sdk/target/debug"
121118
export LD_LIBRARY_PATH="$(pwd)/rust-sdk/target/debug"
122-
env
123119
go test $(go list ./internal/... | grep -v 'internal/tests') -timeout 60s
124120
125121
- name: "Building RPC client"

README.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ Complement Crypto can be compiled and run in different modes depending on which
1414
to test JS SDK then you do not need to compile rust code or run rust tests, and vice versa. Conversely, if you want to test
1515
interoperability between the two SDKs then you need to compile both SDKs.
1616

17+
This means you MUST compile at least 1 SDK in order for Complement-Crypto to compile and run.
18+
1719
#### JS SDK
1820

1921
Run `./rebuild_js_sdk.sh` according to its help page:
@@ -23,9 +25,10 @@ Usage: ./rebuild_js_sdk.sh [version]
2325
[version]: the yarn/npm package to use. This is fed directly into 'yarn add' so branches/commits can be used
2426
2527
Examples:
26-
Install a released version: ./rebuild_js_sdk.sh [email protected]
27-
Install develop branch: ./rebuild_js_sdk.sh matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk#develop
28-
Install specific commit: ./rebuild_js_sdk.sh matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk#36c958642cda08d32bc19c2303ebdfca470d03c1
28+
Install a released version: ./rebuild_js_sdk.sh [email protected]
29+
Install develop branch: ./rebuild_js_sdk.sh matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk#develop
30+
Install specific commit: ./rebuild_js_sdk.sh matrix-js-sdk@https://github.com/matrix-org/matrix-js-sdk#36c958642cda08d32bc19c2303ebdfca470d03c1
31+
Install from a local checkout: ./rebuild_js_sdk.sh matrix-js-sdk@file:/path/to/local/js/sdk"
2932
```
3033

3134
#### Rust SDK

internal/api/rust/matrix_sdk/matrix_sdk.c

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
 (0)