Skip to content

Commit

Permalink
troubleshoot ci
Browse files Browse the repository at this point in the history
  • Loading branch information
insipx committed Jul 8, 2024
1 parent 6ffcfd2 commit 1fca0a3
Show file tree
Hide file tree
Showing 6 changed files with 119 additions and 74 deletions.
10 changes: 1 addition & 9 deletions .github/workflows/test-ffi-bindings.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
name: Test FFI Bindings

on:
push:
branches:
- main

pull_request:
# only run tests when related changes are made
paths:
Expand All @@ -21,27 +19,22 @@ on:
- "Cargo.toml"
- "Cargo.lock"
- "rust-toolchain"

jobs:
test:
name: Test
runs-on: warp-ubuntu-latest-x64-16x
steps:
- name: Checkout
uses: actions/checkout@v4

- name: Update rust toolchains
run: rustup update

- uses: Swatinem/rust-cache@v2
with:
workspaces: |
.
bindings_ffi
- name: Start Docker containers
run: dev/up

- name: Setup Kotlin
run: |
sudo apt update -q
Expand All @@ -50,8 +43,7 @@ jobs:
cd bindings_ffi
make install-jar
echo "$(make echo-jar | tail -n 1 | sed -e 's/\.*export //')" >> "$GITHUB_ENV"
- name: Run cargo test on FFI bindings
run: |
export CLASSPATH="${{ env.CLASSPATH }}"
cargo test --manifest-path bindings_ffi/Cargo.toml -- --test-threads=2
RUST_LOG=warn,xmtpv3::mls=info cargo test --manifest-path bindings_ffi/Cargo.toml -- --test-threads=1
30 changes: 29 additions & 1 deletion bindings_ffi/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions bindings_ffi/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ xmtp_proto = { path = "../xmtp_proto", features = ["proto_full", "grpc"] }
xmtp_user_preferences = { path = "../xmtp_user_preferences" }
xmtp_v2 = { path = "../xmtp_v2" }

tracing-subscriber = { version = "0.3", features = ["env-filter"] }
# NOTE: A regression in openssl-sys exists where libatomic is dynamically linked
# for i686-linux-android targets. https://github.com/sfackler/rust-openssl/issues/2163
#
Expand Down
Loading

0 comments on commit 1fca0a3

Please sign in to comment.