Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
lfzkoala committed May 31, 2024
2 parents 79d714e + 2137e4f commit 4a317b4
Show file tree
Hide file tree
Showing 119 changed files with 11,853 additions and 6,671 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/test.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:

- name: Install Foundry
uses: foundry-rs/foundry-toolchain@v1

- uses: Swatinem/rust-cache@v2
with:
workspaces: |
Expand All @@ -33,6 +33,7 @@ jobs:
timeout-minutes: 20
with:
command: test
args: -- --test-threads=2

- name: Setup Kotlin
run: |
Expand All @@ -46,4 +47,4 @@ jobs:
- name: Run cargo test on FFI bindings
run: |
export CLASSPATH="${{ env.CLASSPATH }}"
cargo test --manifest-path bindings_ffi/Cargo.toml
cargo test --manifest-path bindings_ffi/Cargo.toml -- --test-threads=2
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,8 @@ dist

# Sqlite Instances
*.db3
*.db3-shm
*.db3-wal

# JAR files
*.jar
Expand Down
252 changes: 252 additions & 0 deletions .vscode/launch.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,252 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'xmtp_cli'",
"cargo": {
"args": [
"build",
"--bin=xmtp_cli",
"--package=xmtp_cli"
],
"filter": {
"name": "xmtp_cli",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'xmtp_cli'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=xmtp_cli",
"--package=xmtp_cli"
],
"filter": {
"name": "xmtp_cli",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_api_grpc'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_api_grpc"
],
"filter": {
"name": "xmtp_api_grpc",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_proto'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_proto"
],
"filter": {
"name": "xmtp_proto",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_v2'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_v2"
],
"filter": {
"name": "xmtp_v2",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_cryptography'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_cryptography"
],
"filter": {
"name": "xmtp_cryptography",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_mls'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_mls"
],
"filter": {
"name": "xmtp_mls",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'update-schema'",
"cargo": {
"args": [
"build",
"--bin=update-schema",
"--package=xmtp_mls"
],
"filter": {
"name": "update-schema",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'update-schema'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=update-schema",
"--package=xmtp_mls"
],
"filter": {
"name": "update-schema",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_id'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_id"
],
"filter": {
"name": "xmtp_id",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug executable 'mls-validation-service'",
"cargo": {
"args": [
"build",
"--bin=mls-validation-service",
"--package=mls_validation_service"
],
"filter": {
"name": "mls-validation-service",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in executable 'mls-validation-service'",
"cargo": {
"args": [
"test",
"--no-run",
"--bin=mls-validation-service",
"--package=mls_validation_service"
],
"filter": {
"name": "mls-validation-service",
"kind": "bin"
}
},
"args": [],
"cwd": "${workspaceFolder}"
},
{
"type": "lldb",
"request": "launch",
"name": "Debug unit tests in library 'xmtp_user_preferences'",
"cargo": {
"args": [
"test",
"--no-run",
"--lib",
"--package=xmtp_user_preferences"
],
"filter": {
"name": "xmtp_user_preferences",
"kind": "lib"
}
},
"args": [],
"cwd": "${workspaceFolder}"
}
]
}
Loading

0 comments on commit 4a317b4

Please sign in to comment.