From e24826cea593c87125bc73fe66008675ace4e434 Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Fri, 24 Apr 2020 21:40:06 +0200
Subject: [PATCH] Simplify CI scripts

---
 .builds/beta.yml   |  9 +++------
 .builds/msrv.yml   | 12 +-----------
 .builds/stable.yml |  7 ++-----
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/.builds/beta.yml b/.builds/beta.yml
index 612008ec..c56e6ea1 100644
--- a/.builds/beta.yml
+++ b/.builds/beta.yml
@@ -21,10 +21,7 @@ tasks:
       cargo clippy --all-targets --all-features -- -D warnings
       clippy_exit=$?
 
-      cargo test --no-default-features --verbose
-      test1_exit=$?
+      cargo test --verbose
+      test_exit=$?
 
-      cargo test --all-features --verbose
-      test2_exit=$?
-
-      exit $(( $fmt_exit || $clippy_exit || $test1_exit || $test2_exit ))
+      exit $(( $fmt_exit || $clippy_exit || $test_exit ))
diff --git a/.builds/msrv.yml b/.builds/msrv.yml
index f2821317..de504675 100644
--- a/.builds/msrv.yml
+++ b/.builds/msrv.yml
@@ -11,16 +11,6 @@ tasks:
   - test: |
       cd ruma-api
 
-      # We don't want the build to stop on individual failure of independent
-      # tools, so capture tool exit codes and set the task exit code manually
-      set +e
-
       # Only make sure the code builds with the MSRV. Tests can require later
       # Rust versions, don't compile or run them.
-      cargo build --no-default-features --verbose
-      build1_exit=$?
-
-      cargo build --all-features --verbose
-      build2_exit=$?
-
-      exit $(( $build1_exit || $build2_exit ))
+      cargo build --verbose
diff --git a/.builds/stable.yml b/.builds/stable.yml
index bca18aa7..58a6ce91 100644
--- a/.builds/stable.yml
+++ b/.builds/stable.yml
@@ -21,12 +21,9 @@ tasks:
       cargo clippy --all-targets --all-features -- -D warnings
       clippy_exit=$?
 
-      cargo test --no-default-features --verbose
-      test1_exit=$?
-
       cargo test --all-features --verbose
-      test2_exit=$?
+      test_exit=$?
 
-      exit $(( $fmt_exit || $clippy_exit || $test1_exit || $test2_exit ))
+      exit $(( $fmt_exit || $clippy_exit || $test_exit ))
   # TODO: Add audit task once cargo-audit binary releases are available.
   #       See https://github.com/RustSec/cargo-audit/issues/66