Merge remote-tracking branch 'origin/offsite/scw-libxmtp' into coda/m…

…ls-validation-service

.github/workflows/lint-ffi-bindings.yaml

@@ -1,36 +1,31 @@
 name: Lint FFI Bindings
-
 on:
   push:
     branches:
       - main
-
   pull_request:
     paths:
       - "bindings_ffi/**"
       - ".github/workflows/lint-ffi-bindings.yaml"
       - "rustfmt.toml"
-
+env:
+  CARGO_TERM_COLOR: always
 jobs:
   lint:
     name: Lint
     runs-on: warp-ubuntu-latest-x64-16x
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
       - name: Update rust toolchains
         run: rustup update
-
       - name: Cache
         uses: Swatinem/rust-cache@v2
         with:
           workspaces: |
             .
             bindings_ffi
-
       - name: Run clippy and fail on warnings
         run: cargo clippy --manifest-path bindings_ffi/Cargo.toml --all-features --all-targets --no-deps -- -Dwarnings
-
       - name: Run format check
         run: cargo fmt --manifest-path bindings_ffi/Cargo.toml --check

.github/workflows/lint-node-bindings.yaml

@@ -6,7 +6,8 @@ on:
       - "bindings_node/**"
       - ".github/workflows/lint-node-bindings.yaml"
       - "rustfmt.toml"
-
+env:
+  CARGO_TERM_COLOR: always
 jobs:
   lint:
     name: Lint

.github/workflows/lint-workspace.yaml

@@ -18,6 +18,8 @@ on:
       - "Cargo.lock"
       - "rust-toolchain"
       - "rustfmt.toml"
+env:
+  CARGO_TERM_COLOR: always
 jobs:
   lint:
     name: Lint

.github/workflows/release-cli.yml

@@ -5,7 +5,8 @@ on:
     branches:
       - main
   workflow_dispatch:
-
+env:
+  CARGO_TERM_COLOR: always
 jobs:
   build:
     strategy:

.github/workflows/test-ffi-bindings.yml

@@ -1,10 +1,8 @@
 name: Test FFI Bindings
-
 on:
   push:
     branches:
       - main
-
   pull_request:
     # only run tests when related changes are made
     paths:
@@ -21,27 +19,24 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - "rust-toolchain"
-
+env:
+  CARGO_TERM_COLOR: always
 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
@@ -50,8 +45,9 @@ 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
+      - name: Install nextest
+        uses: taiki-e/install-action@nextest
+      - name: Run cargo nextest on FFI bindings
         run: |
           export CLASSPATH="${{ env.CLASSPATH }}"
-          cargo test --manifest-path bindings_ffi/Cargo.toml -- --test-threads=2
+          cargo nextest run --manifest-path bindings_ffi/Cargo.toml --test-threads 2

.github/workflows/test-http-api.yml

@@ -18,6 +18,8 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - "rust-toolchain"
+env:
+  CARGO_TERM_COLOR: always
 jobs:
   test:
     name: Test
@@ -36,5 +38,7 @@ jobs:
             .
       - name: Start Docker containers
         run: dev/up
-      - name: Run cargo test on main workspace
-        run: cargo test --workspace --exclude xmtp_api_grpc --features http-api -- --test-threads=2
+      - name: Install nextest
+        uses: taiki-e/install-action@nextest
+      - name: Run cargo nextest on main workspace
+        run: cargo nextest run --workspace --exclude xmtp_api_grpc --features http-api --test-threads 2

.github/workflows/test-workspace.yml

@@ -18,6 +18,8 @@ on:
       - "Cargo.toml"
       - "Cargo.lock"
       - "rust-toolchain"
+env:
+  CARGO_TERM_COLOR: always
 jobs:
   test:
     name: Test
@@ -36,5 +38,7 @@ jobs:
             .
       - name: Start Docker containers
         run: dev/up
-      - name: Run cargo test on main workspace
-        run: cargo test -- --test-threads=2
+      - name: Install nextest
+        uses: taiki-e/install-action@nextest
+      - name: Run cargo nextest on main workspace
+        run: cargo nextest run --test-threads 2

Cargo.toml

@@ -36,7 +36,6 @@ futures = "0.3.30"
 futures-core = "0.3.30"
 getrandom = { version = "0.2", default-features = false }
 hex = "0.4.3"
-log = { version = "0.4" }
 openmls = { git = "https://github.com/xmtp/openmls", rev = "87e7e257d8eb15d6662b104518becfc75ef6db76", default-features = false }
 openmls_basic_credential = { git = "https://github.com/xmtp/openmls", rev = "87e7e257d8eb15d6662b104518becfc75ef6db76" }
 openmls_rust_crypto = { git = "https://github.com/xmtp/openmls", rev = "87e7e257d8eb15d6662b104518becfc75ef6db76" }
@@ -55,7 +54,7 @@ thiserror = "1.0"
 tls_codec = "0.4.1"
 tokio = { version = "1.35.1", default-features = false }
 tonic = "^0.12"
-tracing = { version = "0.1" }
+tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = "0.3"
 url = "2.5.0"
 

Dockerfile

@@ -8,6 +8,7 @@ COPY --chown=xmtp:xmtp rust-toolchain .
 ENV RUSTUP_PERMIT_COPY_RENAME "yes"
 
 RUN rustup update
+RUN curl -LsSf https://get.nexte.st/latest/linux | tar zxf - -C ${CARGO_HOME:-~/.cargo}/bin
 
 LABEL org.label-schema.build-date=$BUILD_DATE \
     org.label-schema.name="rustdev" \