Skip to content

Commit

Permalink
Merge pull request #58 from matrix-org/kegan/rust-main2
Browse files Browse the repository at this point in the history
Use latest main rust sdk
  • Loading branch information
kegsay authored May 13, 2024
2 parents 55ea635 + 5c5f3e5 commit d276300
Show file tree
Hide file tree
Showing 5 changed files with 1,007 additions and 620 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/single_sdk_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ jobs:
export COMPLEMENT_CRYPTO_RPC_BINARY="$(pwd)/complement-crypto/rpc"
cd complement-crypto &&
set -o pipefail &&
go test -v -json -tags=$GO_TAGS -timeout 15m ./tests | gotestfmt
go test -v -count=1 -json -tags=$GO_TAGS -timeout 15m ./tests | gotestfmt
shell: bash # required for pipefail to be A Thing. pipefail is required to stop gotestfmt swallowing non-zero exit codes
env:
COMPLEMENT_BASE_IMAGE: homeserver
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
name: Tests (Rust only, latest main)
uses: ./.github/workflows/single_sdk_tests.yml
with:
use_rust_sdk: 'dddc607e077511aa8c28a09856c0628d316c4dd4' # TODO: go back to main when it works with uniffi 0.25 again
use_rust_sdk: 'main'
use_complement_crypto: '.'

complement:
Expand All @@ -49,7 +49,7 @@ jobs:
- name: Checkout matrix-rust-sdk
run: |
mkdir rust-sdk
wget -O archive.tar.gz "https://github.com/matrix-org/matrix-rust-sdk/archive/dddc607e077511aa8c28a09856c0628d316c4dd4.tar.gz"
wget -O archive.tar.gz "https://github.com/matrix-org/matrix-rust-sdk/archive/main.tar.gz"
zcat < archive.tar.gz | git get-tar-commit-id # useful for debugging
tar -xz --strip-components=1 -C rust-sdk < archive.tar.gz
- uses: Swatinem/rust-cache@v2
Expand Down Expand Up @@ -134,7 +134,7 @@ jobs:
export LD_LIBRARY_PATH="$(pwd)/rust-sdk/target/debug"
export COMPLEMENT_CRYPTO_RPC_BINARY="$(pwd)/rpc"
set -o pipefail &&
go test -v -json -timeout 15m ./internal/tests | gotestfmt
go test -v -json -count=1 -timeout 15m ./internal/tests | gotestfmt
shell: bash # required for pipefail to be A Thing. pipefail is required to stop gotestfmt swallowing non-zero exit codes
env:
COMPLEMENT_BASE_IMAGE: homeserver
Expand All @@ -149,7 +149,7 @@ jobs:
export LD_LIBRARY_PATH="$(pwd)/rust-sdk/target/debug"
export COMPLEMENT_CRYPTO_RPC_BINARY="$(pwd)/rpc"
set -o pipefail &&
go test -v -json -tags='jssdk,rust' -timeout 15m ./tests | gotestfmt
go test -v -json -tags='jssdk,rust' -count=1 -timeout 15m ./tests | gotestfmt
shell: bash # required for pipefail to be A Thing. pipefail is required to stop gotestfmt swallowing non-zero exit codes
name: Run Complement Crypto Tests
env:
Expand Down
Loading

0 comments on commit d276300

Please sign in to comment.