ci: Unbreak mutually exclusive features

matrix-org · Feb 8, 2024 · b0eb7be · b0eb7be
1 parent 08159e0
commit b0eb7be
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 12 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -184,7 +184,8 @@ jobs:
       - name: Test
         run: |
           cargo nextest run --workspace \
-            --exclude matrix-sdk-integration-testing --features testing
+            --exclude matrix-sdk-integration-testing
+            --no-default-features --features __ci_or_development
 
       - name: Test documentation
         run: |

diff --git a/bindings/matrix-sdk-ffi/Cargo.toml b/bindings/matrix-sdk-ffi/Cargo.toml
@@ -13,8 +13,15 @@ repository = "https://github.com/matrix-org/matrix-rust-sdk"
 crate-type = ["cdylib", "staticlib"]
 
 [features]
-default = ["bundled-sqlite"]
+default = ["bundled-sqlite", "rustls-tls"]
+
 bundled-sqlite = ["matrix-sdk/bundled-sqlite"]
+native-tls = ["matrix-sdk/native-tls"]
+rustls-tls = ["matrix-sdk/rustls-tls"]
+
+# Don't use rustls for --workspace tests / clippy / doc checks, as only one
+# TLS backend can be enabled at a time.
+__ci_or_development = ["native-tls"]
 
 [build-dependencies]
 uniffi = { workspace = true, features = ["build"] }
@@ -29,7 +36,7 @@ eyeball-im = { workspace = true }
 extension-trait = "1.0.1"
 futures-core = { workspace = true }
 futures-util = { workspace = true }
-matrix-sdk = { workspace = true, features = ["anyhow", "e2e-encryption", "experimental-oidc", "experimental-sliding-sync", "experimental-widgets", "markdown", "rustls-tls", "socks", "sqlite", "uniffi"] }
+matrix-sdk = { workspace = true, features = ["anyhow", "e2e-encryption", "experimental-oidc", "experimental-sliding-sync", "experimental-widgets", "markdown", "socks", "sqlite", "uniffi"] }
 matrix-sdk-ui = { workspace = true, features = ["e2e-encryption", "uniffi"] }
 mime = "0.3.16"
 once_cell = { workspace = true }

diff --git a/contrib/ide/vscode/settings.json b/contrib/ide/vscode/settings.json
@@ -1,4 +1,6 @@
 {
   "rust-analyzer.checkOnSave.command": "clippy",
-  "rust-analyzer.rustfmt.extraArgs": ["+nightly"]
+  "rust-analyzer.rustfmt.extraArgs": ["+nightly"],
+  "rust-analyzer.cargo.noDefaultFeatures": true,
+  "rust-analyzer.cargo.features": ["__ci_or_development"]
 }
diff --git a/crates/matrix-sdk/Cargo.toml b/crates/matrix-sdk/Cargo.toml
@@ -59,7 +59,18 @@ experimental-sliding-sync = [
 ]
 experimental-widgets = ["dep:language-tags", "dep:uuid"]
 
-docsrs = ["e2e-encryption", "sqlite", "indexeddb", "sso-login", "qrcode", "image-proc"]
+__ci_or_development = [
+    "e2e-encryption",
+    "sqlite",
+    "indexeddb",
+    "sso-login",
+    "qrcode",
+    "image-proc",
+    "image-rayon",
+    "experimental-oidc",
+    "experimental-sliding-sync",
+    "experimental-widgets",
+]
 
 [dependencies]
 anyhow = { workspace = true, optional = true }

diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs
@@ -183,7 +183,7 @@ fn check_clippy() -> Result<()> {
         "rustup run {NIGHTLY} cargo clippy --workspace --all-targets
             --exclude matrix-sdk-crypto --exclude xtask
             --no-default-features
-            --features native-tls,experimental-sliding-sync,sso-login,testing
+            --features __ci_or_development
             -- -D warnings"
     )
     .run()?;

diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -62,12 +62,17 @@ fn build_docs(
     }
 
     // Keep in sync with .github/workflows/docs.yml
-    cmd!("rustup run {NIGHTLY} cargo doc --no-deps --workspace --features docsrs")
-        // Work around https://github.com/rust-lang/cargo/issues/10744
-        .env("CARGO_TARGET_APPLIES_TO_HOST", "true")
-        .env("RUSTDOCFLAGS", rustdocflags)
-        .args(extra_args)
-        .run()?;
+    cmd!(
+        "
+        rustup run {NIGHTLY} cargo doc
+            --no-deps --workspace --no-default-features --features __ci_or_development
+        "
+    )
+    // Work around https://github.com/rust-lang/cargo/issues/10744
+    .env("CARGO_TARGET_APPLIES_TO_HOST", "true")
+    .env("RUSTDOCFLAGS", rustdocflags)
+    .args(extra_args)
+    .run()?;
 
     Ok(())
 }