From 10bd847177c6c5ecbbdc37ecba78bc36508f1a91 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Thu, 2 May 2024 01:28:38 +0100
Subject: [PATCH] ci: fix msrv checks

---
 .github/workflows/ci.yml | 13 +++----------
 Cargo.toml               |  2 +-
 justfile                 | 12 ++++++++++++
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 623587df..47aba831 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -58,24 +58,17 @@ jobs:
         with:
           toolchain: ${{ matrix.version.version }}
 
-      - name: Install cargo-hack and cargo-ci-cache-clean
+      - name: Install just, cargo-hack, cargo-ci-cache-clean
         uses: taiki-e/install-action@v2.28.1
         with:
-          tool: cargo-hack,cargo-ci-cache-clean
+          tool: just,cargo-hack,cargo-ci-cache-clean
 
       - name: Generate Cargo.lock
         run: cargo generate-lockfile
 
       - name: workaround MSRV issues
         if: matrix.version.name == 'msrv'
-        run: |
-          cargo update -p=ahash --precise=0.8.7
-          cargo update -p=ciborium --precise=0.2.1
-          cargo update -p=ciborium-ll --precise=0.2.1
-          cargo update -p=time --precise=0.3.16
-          cargo update -p=clap --precise=4.3.24
-          cargo update -p=clap_lex --precise=0.5.0
-          cargo update -p=anstyle --precise=1.0.2
+        run: just downgrade-msrv
 
       - name: check lib
         if: >
diff --git a/Cargo.toml b/Cargo.toml
index 696de4a5..ae46b5d7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,4 +1,5 @@
 [workspace]
+resolver = "2"
 members = [
   "actix-codec",
   "actix-macros",
@@ -12,7 +13,6 @@ members = [
   "local-channel",
   "local-waker",
 ]
-resolver = "2"
 
 [workspace.package]
 license = "MIT OR Apache-2.0"
diff --git a/justfile b/justfile
index 86bd8412..511d2180 100644
--- a/justfile
+++ b/justfile
@@ -1,6 +1,18 @@
 _list:
     @just --list
 
+# Downgrade dev-dependencies necessary to run MSRV checks/tests.
+[private]
+downgrade-msrv:
+    cargo update -p=ahash --precise=0.8.7
+    cargo update -p=ciborium --precise=0.2.1
+    cargo update -p=ciborium-ll --precise=0.2.1
+    cargo update -p=time --precise=0.3.16
+    cargo update -p=clap --precise=4.3.24
+    cargo update -p=clap_lex --precise=0.5.0
+    cargo update -p=anstyle --precise=1.0.2
+    cargo update -p=trybuild --precise=1.0.89
+
 # Document crates in workspace.
 doc:
     RUSTDOCFLAGS="--cfg=docsrs" cargo +nightly doc --no-deps --workspace --features=rustls,openssl