mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-07 23:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(ci): Fix path to matrix-sdk-crypto-js and allow pushd to return an error.

Browse Source 
First off, this patch changes `pushd(…)` to `pushd(…)?` so that errors
are propagated.

Second, instead of assuming that all crates live in `crates/`, let's
allow to precise a prefix, like `crates/` or `bindings/` directly in the
“folder” path of `args`.
This commit is contained in:
Ivan Enderlin
2023-05-17 17:12:52 +02:00
parent 51e6e80b3b
commit fc37f337fb
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
xtask/src/ci.rs
View File

@@ -343,34 +343,37 @@ fn run_wasm_pack_tests(cmd: Option<WasmFeatureSet>) -> Result<()> {
return Ok(());
}
let args = BTreeMap::from([
(WasmFeatureSet::MatrixSdkQrcode, ("matrix-sdk-qrcode", "")),
(WasmFeatureSet::MatrixSdkQrcode, ("crates/matrix-sdk-qrcode", "")),
(
WasmFeatureSet::MatrixSdkNoDefault,
("matrix-sdk", "--no-default-features --features js,rustls-tls --lib"),
("crates/matrix-sdk", "--no-default-features --features js,rustls-tls --lib"),
),
(WasmFeatureSet::MatrixSdkBase, ("matrix-sdk-base", "--features js")),
(WasmFeatureSet::MatrixSdkCommon, ("matrix-sdk-common", "--features js")),
(WasmFeatureSet::MatrixSdkCryptoJs, ("matrix-sdk-crypto-js", "")),
(WasmFeatureSet::MatrixSdkBase, ("crates/matrix-sdk-base", "--features js")),
(WasmFeatureSet::MatrixSdkCommon, ("crates/matrix-sdk-common", "--features js")),
(WasmFeatureSet::MatrixSdkCryptoJs, ("bindings/matrix-sdk-crypto-js", "")),
(
WasmFeatureSet::MatrixSdkIndexeddbStoresNoCrypto,
("matrix-sdk", "--no-default-features --features js,indexeddb,rustls-tls --lib"),
("crates/matrix-sdk", "--no-default-features --features js,indexeddb,rustls-tls --lib"),
),
(
WasmFeatureSet::MatrixSdkIndexeddbStores,
(
"matrix-sdk",
"crates/matrix-sdk",
"--no-default-features --features js,indexeddb,e2e-encryption,rustls-tls --lib",
),
),
(WasmFeatureSet::IndexeddbNoCrypto, ("matrix-sdk-indexeddb", "--no-default-features")),
(
WasmFeatureSet::IndexeddbNoCrypto,
("crates/matrix-sdk-indexeddb", "--no-default-features"),
),
(
WasmFeatureSet::IndexeddbWithCrypto,
("matrix-sdk-indexeddb", "--no-default-features --features e2e-encryption"),
("crates/matrix-sdk-indexeddb", "--no-default-features --features e2e-encryption"),
),
]);
let run = |(folder, arg_set): (&str, &str)| {
let _p = pushd(format!("crates/{folder}"));
let _ = pushd(folder)?;
cmd!("pwd").env(WASM_TIMEOUT_ENV_KEY, WASM_TIMEOUT_VALUE).run()?; // print dir so we know what might have failed
cmd!("wasm-pack test --node -- ")
.args(arg_set.split_whitespace())