Merge branch 'main' into separate_import_error

Signed-off-by: Hubert Chathi <[email protected]>

Author: uhoreg

.deny.toml

@@ -10,13 +10,15 @@ exclude = [
 version = 2
 ignore = [
     { id = "RUSTSEC-2024-0436", reason = "Unmaintained paste crate, not critical." },
+    { id = "RUSTSEC-2025-0056", reason = "Unmaintained adler crate, not a direct dependency" },
 ]
 
 [licenses]
 version = 2
 allow = [
     "Apache-2.0",
     "Apache-2.0 WITH LLVM-exception",
+    "CDLA-Permissive-2.0",
     "BSD-2-Clause",
     "BSD-3-Clause",
     "BSL-1.0",
@@ -28,15 +30,6 @@ allow = [
 ]
 exceptions = [
     { allow = ["Unicode-DFS-2016"], crate = "unicode-ident" },
-    { allow = ["CDDL-1.0"], crate = "inferno" },
-    { allow = ["LicenseRef-ring"], crate = "ring" },
-]
-
-[[licenses.clarify]]
-name = "ring"
-expression = "LicenseRef-ring"
-license-files = [
-    { path = "LICENSE", hash = 0xbd0eed23 },
 ]
 
 [bans]
@@ -51,9 +44,7 @@ unknown-git = "deny"
 allow-git = [
     # A patch override for the bindings fixing a bug for Android before upstream
     # releases a new version.
-    "https://github.com/element-hq/tracing.git",
-    # Same as for the tracing dependency.
-    "https://github.com/element-hq/paranoid-android.git",
+    "https://github.com/tokio-rs/tracing.git",
     # Well, it's Ruma.
     "https://github.com/ruma/ruma",
     # A patch override for the bindings: https://github.com/rodrimati1992/const_panic/pull/10

.github/workflows/benchmarks.yml

@@ -19,6 +19,7 @@ jobs:
           - linked_chunk
           - store_bench
           - timeline
+          - room_list
 
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8
@@ -34,7 +35,8 @@ jobs:
         run: cargo codspeed build -p benchmarks ${{ matrix.benchmark }} --features codspeed
 
       - name: Run the benchmarks
-        uses: CodSpeedHQ/action@0b6e7a3d96c9d2a6057e7bcea6b45aaf2f7ce60b
+        uses: CodSpeedHQ/action@653fdc30e6c40ffd9739e40c8a0576f4f4523ca1
         with:
           run: cargo codspeed run
+          mode: "instrumentation"
           token: ${{ secrets.CODSPEED_TOKEN }}

.github/workflows/bindings_ci.yml

@@ -79,7 +79,7 @@ jobs:
           ref: main
 
       - name: Use JDK 17
-        uses: actions/setup-java@v4
+        uses: actions/setup-java@v5
         with:
           distribution: 'temurin' # See 'Supported distributions' for available options
           java-version: '17'

.github/workflows/ci.yml

@@ -251,7 +251,7 @@ jobs:
         uses: qmaru/[email protected]
         if: '!matrix.check_only'
         with:
-          version: v0.10.3
+          version: v0.13.1
 
       - name: Load cache
         uses: Swatinem/rust-cache@v2
@@ -292,7 +292,7 @@ jobs:
         uses: actions/checkout@v5
 
       - name: Check the spelling of the files in our repo
-        uses: crate-ci/typos@v1.35.4
+        uses: crate-ci/typos@v1.36.2
 
   lint:
     name: Lint
@@ -335,8 +335,7 @@ jobs:
           target/debug/xtask ci clippy
 
   integration-tests:
-    name: Integration test
-
+    name: 'Integration test (features: ${{ matrix.feature }})'
     runs-on: ubuntu-latest
 
     # run several docker containers with the same networking stack so the hostname 'synapse'
@@ -352,6 +351,13 @@ jobs:
         ports:
             - 8008:8008
 
+    strategy:
+      fail-fast: true
+      matrix:
+        feature:
+          - "default"
+          - "experimental-encrypted-state-events"
+
     steps:
       - name: Checkout the repo
         uses: actions/checkout@v5
@@ -378,7 +384,7 @@ jobs:
           HOMESERVER_URL: "http://localhost:8008"
           HOMESERVER_DOMAIN: "synapse"
         run: |
-          cargo nextest run -p matrix-sdk-integration-testing
+          cargo nextest run -p matrix-sdk-integration-testing --features "${{ matrix.feature }}"
 
   compile-bench:
     name: 🚄 Compile benchmarks

.github/workflows/detect-long-path.yml

@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v5
       - name: Check for changed files
         id: changed-files
-        uses: tj-actions/changed-files@v46.0.5
+        uses: tj-actions/changed-files@v47.0.0
       - name: Detect long path
         env:
           ALL_CHANGED_FILES: ${{ steps.changed-files.outputs.all_changed_files }} # ignore the deleted files

.github/workflows/documentation.yml

@@ -34,7 +34,7 @@ jobs:
           toolchain: nightly-2025-08-08
 
       - name: Install Node.js
-        uses: actions/setup-node@v4
+        uses: actions/setup-node@v5
         with:
           node-version: 20
 
@@ -52,7 +52,7 @@ jobs:
 
       - name: Upload artifact
         if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-        uses: actions/upload-pages-artifact@v3
+        uses: actions/upload-pages-artifact@v4
         with:
           path: './target/doc/'
 

.github/workflows/upload_coverage.yml

@@ -18,7 +18,7 @@ jobs:
     steps:
       - name: 'Fetch coverage report from artifacts'
         id: prepare_report
-        uses: actions/github-script@v7
+        uses: actions/github-script@v8
         with:
           script: |
             var fs = require('fs');