From 718c3adcb258b43bac6b1a9179c4341df455b8ea Mon Sep 17 00:00:00 2001
From: Jason Volk <jason@zemos.net>
Date: Thu, 23 Oct 2025 11:45:38 +0000
Subject: [PATCH] ci: Expand the rust-sdk integration matrix.

Signed-off-by: Jason Volk <jason@zemos.net>
---
 .github/workflows/test.yml        | 23 +++++++++++++++--------
 docker/Dockerfile.matrix-rust-sdk |  2 +-
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f02c190c..74ad4569 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -226,7 +226,7 @@ jobs:
       && !contains(inputs.head_msg, '[ci only it]')
       && !contains(inputs.head_msg, '[ci no build]')
       && contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0])
-      && contains(fromJSON(inputs.complement_feat_sets), fromJSON('["all"]')[0])
+      && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["stable"]')[0])
       && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
       && fromJSON(inputs.build_nix)
@@ -251,9 +251,9 @@ jobs:
       !failure() && !cancelled()
       && !contains(inputs.head_msg, '[ci no build]')
       && inputs.rust_sdk_integration
-      && contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0])
-      && contains(fromJSON(inputs.complement_feat_sets), fromJSON('["all"]')[0])
+      && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
       && contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[0])
+      && contains(fromJSON(inputs.rust_targets), fromJSON('["x86_64-unknown-linux-gnu"]')[0])
       && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
 
     name: Matrix SDK Integration
@@ -261,16 +261,15 @@ jobs:
     uses: ./.github/workflows/bake.yml
     with:
       bake_targets: '["matrix-rust-sdk-integration"]'
-      cargo_profiles: '["test"]'
-      feat_sets: ${{inputs.complement_feat_sets}}
+      cargo_profiles: ${{inputs.cargo_profiles}}
+      feat_sets: '["all"]'
       rust_toolchains: '["nightly"]'
       sys_names: ${{inputs.sys_names}}
       sys_versions: ${{inputs.sys_versions}}
-      rust_targets: ${{inputs.rust_targets}}
+      rust_targets: '["x86_64-unknown-linux-gnu"]'
       sys_targets: '["x86_64-v1-linux-gnu"]'
-      machines: ${{inputs.machines}}
+      machines: '["X64"]'
       runner: ${{inputs.complement_runner}}
-      excludes: ${{inputs.excludes}}
       includes: ${{inputs.includes}}
       artifact: >
         {
@@ -279,6 +278,14 @@ jobs:
             "dst": "matrix-rust-sdk-integration.tuwunel.log",
           }
         }
+      excludes: >
+        [
+          {"feat_set": "none"},
+          {"feat_set": "logging"},
+          {"cargo_profile": "release"},
+          {"cargo_profile": "release-debuginfo"},
+          {"cargo_profile": "release-native"},
+        ]
 
   complement:
     if: >
diff --git a/docker/Dockerfile.matrix-rust-sdk b/docker/Dockerfile.matrix-rust-sdk
index 3f6ee31c..47a7dbf1 100644
--- a/docker/Dockerfile.matrix-rust-sdk
+++ b/docker/Dockerfile.matrix-rust-sdk
@@ -19,7 +19,7 @@ WORKDIR /
 COPY --link --from=input . .
 
 WORKDIR /usr/src
-ADD --link https://github.com/matrix-construct/matrix-rust-sdk.git matrix-rust-sdk
+ADD --link https://github.com/matrix-construct/matrix-rust-sdk.git#integration matrix-rust-sdk
 
 WORKDIR /etc
 COPY <<EOF tuwunel.toml