From 43abef7e1f292cdad842b319fc218f717bc78187 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Fri, 6 Sep 2024 20:37:28 +0200
Subject: [PATCH] ci: Update MSRV jobs

- Fix msrv-all enabling ruma-macros' nightly-only feature
- Test ruma-client in msrv-all, remove separate job
---
 .github/workflows/ci.yml |  3 ---
 xtask/src/ci.rs          | 17 +++--------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 93ce0367..d942fc58 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,9 +76,6 @@ jobs:
           - name: Check All Features
             cmd: msrv-all
 
-          - name: Check Client
-            cmd: msrv-client
-
           - name: Check Ruma
             cmd: msrv-ruma
 
diff --git a/xtask/src/ci.rs b/xtask/src/ci.rs
index 058c563d..4b75be25 100644
--- a/xtask/src/ci.rs
+++ b/xtask/src/ci.rs
@@ -28,8 +28,6 @@ pub enum CiCmd {
     Msrv,
     /// Check all crates with all features (msrv)
     MsrvAll,
-    /// Check ruma-client with default features (msrv)
-    MsrvClient,
     /// Check ruma crate with default features (msrv)
     MsrvRuma,
     /// Check ruma-identifiers with `ruma_identifiers_storage="Box"`
@@ -101,7 +99,6 @@ impl CiTask {
         match self.cmd {
             Some(CiCmd::Msrv) => self.msrv()?,
             Some(CiCmd::MsrvAll) => self.msrv_all()?,
-            Some(CiCmd::MsrvClient) => self.msrv_client()?,
             Some(CiCmd::MsrvRuma) => self.msrv_ruma()?,
             Some(CiCmd::MsrvOwnedIdBox) => self.msrv_owned_id_box()?,
             Some(CiCmd::MsrvOwnedIdArc) => self.msrv_owned_id_arc()?,
@@ -139,21 +136,20 @@ impl CiTask {
     /// Check that the crates compile with the MSRV.
     fn msrv(&self) -> Result<()> {
         self.msrv_all()?;
-        self.msrv_client()?;
         self.msrv_ruma()
     }
 
     /// Check all crates with all features with the MSRV, except:
     /// * ruma (would pull in ruma-signatures)
-    /// * ruma-client (tested only with client-api feature due to most / all optional HTTP client
-    ///   deps having less strict MSRV)
+    /// * ruma-macros (it's still pulled as a dependency but don't want to enable its nightly-only
+    ///   internal feature here)
     /// * ruma-signatures (MSRV exception)
     /// * xtask (no real reason to enforce an MSRV for it)
     fn msrv_all(&self) -> Result<()> {
         cmd!(
             "rustup run {MSRV} cargo check --workspace --all-features
                 --exclude ruma
-                --exclude ruma-client
+                --exclude ruma-macros
                 --exclude ruma-signatures
                 --exclude xtask"
         )
@@ -161,13 +157,6 @@ impl CiTask {
         .map_err(Into::into)
     }
 
-    /// Check ruma-client with default features with the MSRV.
-    fn msrv_client(&self) -> Result<()> {
-        cmd!("rustup run {MSRV} cargo check -p ruma-client --features client-api")
-            .run()
-            .map_err(Into::into)
-    }
-
     /// Check ruma crate with default features with the MSRV.
     fn msrv_ruma(&self) -> Result<()> {
         cmd!("rustup run {MSRV} cargo check -p ruma").run().map_err(Into::into)