From f5bfee3f8d9b70c25db5d1261d47155a5d0084e3 Mon Sep 17 00:00:00 2001
From: Wim de With <wf@dewith.io>
Date: Mon, 25 Nov 2019 23:37:05 +0100
Subject: [PATCH] Bump MSRV and run CI on multiple Rust versions

---
 .travis.yml | 40 +++++++++++++++++++++++++++++++---------
 README.md   |  2 +-
 2 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 3221d1c7..3519fea0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,38 @@
 language: "rust"
 cache: "cargo"
+rust:
+  - 1.36.0
+  - stable
+  - beta
+  - nightly
+jobs:
+  allow_failures:
+    - rust: nightly
+  fast_finish: true
+
 before_script:
-  - "rustup component add rustfmt"
-  - "rustup component add clippy"
-  - "cargo install --force cargo-audit"
-  - "cargo generate-lockfile"
+  - rustup component add rustfmt
+  - |
+      if [ "$TRAVIS_RUST_VERSION" != "1.36.0" ]; then
+        rustup component add clippy
+      fi
+  - |
+      if [ "$TRAVIS_RUST_VERSION" == "stable" ]; then
+        cargo install --force cargo-audit
+      fi
+  - cargo generate-lockfile
 script:
-  - "cargo audit"
-  - "cargo fmt --all -- --check"
-  - "cargo clippy --all-targets --all-features -- -D warnings"
-  - "cargo build --verbose"
-  - "cargo test --verbose"
+  - |
+      if [ "$TRAVIS_RUST_VERSION" == "stable" ]; then
+        cargo audit
+      fi
+  - cargo fmt -- --check
+  - |
+      if [ "$TRAVIS_RUST_VERSION" != "1.36.0" ]; then
+        cargo clippy --all-targets --all-features -- -D warnings
+      fi
+  - cargo build --verbose
+  - cargo test --verbose
 if: "type != push OR (tag IS blank AND branch = master)"
 notifications:
   email: false
diff --git a/README.md b/README.md
index 885284b2..f54043e3 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ These types can be shared by application service and server code.
 
 ## Minimum Rust version
 
-ruma-appservice-api requires Rust 1.34.2 or later.
+ruma-appservice-api requires Rust 1.36.0 or later.
 
 ## Status