From 2bb118fce16f2d5a1a85fce96d228acc23df827e Mon Sep 17 00:00:00 2001
From: Sam Scott <sam@osohq.com>
Date: Sun, 7 Apr 2024 15:23:28 -0500
Subject: Fix MSRV (#99)

* Remove `then_some` to stay compatible with earlier versions of Rust

* Fix CI builds to build on old versions of Rust

* Trying 1.61
---
 .github/workflows/ci.yml | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to '.github/workflows/ci.yml')

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 373269f..9034936 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -10,15 +10,13 @@ jobs:
       matrix:
         rust:
           - stable
-          - 1.36.0
+          - 1.61.0
     steps:
       - uses: actions/checkout@v2
       - name: Install Rust stable toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
           toolchain: stable
-          override: true
           components: rustfmt, clippy
       - name: Check Rust formatting
         uses: actions-rs/cargo@v1
@@ -38,13 +36,22 @@ jobs:
       matrix:
         rust:
           - stable
-          - 1.36.0
+          - 1.61.0
         feature:
           - ""
           - actix4
           - actix3
           - warp
           - axum
+        exclude:
+        - rust: 1.61.0
+          feature: actix4
+        - rust: 1.61.0
+          feature: actix3
+        - rust: 1.61.0
+          feature: warp
+        - rust: 1.61.0
+          feature: axum
     steps:
       - uses: actions/checkout@v2
       - uses: actions/cache@v2
@@ -55,10 +62,9 @@ jobs:
             target
           key: ${{ runner.os }}-cargo-test-${{ hashFiles('Cargo.toml') }}
       - name: Install Rust stable toolchain
-        uses: actions-rs/toolchain@v1
+        uses: dtolnay/rust-toolchain@master
         with:
-          profile: minimal
-          toolchain: stable
+          toolchain: ${{ matrix.rust }}
       - name: Run test ${{ matrix.feature }}
         run: |
           cargo test --all-targets --features "${{ matrix.feature }}"
-- 
cgit v1.2.3