studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

ci: Expand the rust-sdk integration matrix.

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2025-10-23 11:45:38 +00:00
parent af80482c04
commit 718c3adcb2
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
.github/workflows/test.yml vendored
View File

@@ -226,7 +226,7 @@ jobs:
&& !contains(inputs.head_msg, '[ci only it]') && !contains(inputs.head_msg, '[ci only it]')
&& !contains(inputs.head_msg, '[ci no build]') && !contains(inputs.head_msg, '[ci no build]')
&& contains(fromJSON(inputs.cargo_profiles), fromJSON('["release"]')[0]) && 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.rust_toolchains), fromJSON('["stable"]')[0])
&& contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0]) && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
&& fromJSON(inputs.build_nix) && fromJSON(inputs.build_nix)
@@ -251,9 +251,9 @@ jobs:
!failure() && !cancelled() !failure() && !cancelled()
&& !contains(inputs.head_msg, '[ci no build]') && !contains(inputs.head_msg, '[ci no build]')
&& inputs.rust_sdk_integration && inputs.rust_sdk_integration
&& contains(fromJSON(inputs.cargo_profiles), fromJSON('["test"]')[0]) && contains(fromJSON(inputs.feat_sets), fromJSON('["all"]')[0])
&& contains(fromJSON(inputs.complement_feat_sets), fromJSON('["all"]')[0])
&& contains(fromJSON(inputs.rust_toolchains), fromJSON('["nightly"]')[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]) && contains(fromJSON(inputs.sys_targets), fromJSON('["x86_64-v1-linux-gnu"]')[0])
name: Matrix SDK Integration name: Matrix SDK Integration
@@ -261,16 +261,15 @@ jobs:
uses: ./.github/workflows/bake.yml uses: ./.github/workflows/bake.yml
with: with:
bake_targets: '["matrix-rust-sdk-integration"]' bake_targets: '["matrix-rust-sdk-integration"]'
cargo_profiles: '["test"]' cargo_profiles: ${{inputs.cargo_profiles}}
feat_sets: ${{inputs.complement_feat_sets}} feat_sets: '["all"]'
rust_toolchains: '["nightly"]' rust_toolchains: '["nightly"]'
sys_names: ${{inputs.sys_names}} sys_names: ${{inputs.sys_names}}
sys_versions: ${{inputs.sys_versions}} sys_versions: ${{inputs.sys_versions}}
rust_targets: ${{inputs.rust_targets}} rust_targets: '["x86_64-unknown-linux-gnu"]'
sys_targets: '["x86_64-v1-linux-gnu"]' sys_targets: '["x86_64-v1-linux-gnu"]'
machines: ${{inputs.machines}} machines: '["X64"]'
runner: ${{inputs.complement_runner}} runner: ${{inputs.complement_runner}}
excludes: ${{inputs.excludes}}
includes: ${{inputs.includes}} includes: ${{inputs.includes}}
artifact: > artifact: >
{ {
@@ -279,6 +278,14 @@ jobs:
"dst": "matrix-rust-sdk-integration.tuwunel.log", "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: complement:
if: > if: >

2
docker/Dockerfile.matrix-rust-sdk
View File

@@ -19,7 +19,7 @@ WORKDIR /
COPY --link --from=input . . COPY --link --from=input . .
WORKDIR /usr/src 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 WORKDIR /etc
COPY <<EOF tuwunel.toml COPY <<EOF tuwunel.toml