From 3ce90c5ec2237537de0e49a8f24984c5c43336c7 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Fri, 3 May 2024 16:54:33 -0700
Subject: [PATCH 1/2] Fix older CI for num-traits 0.2.19

---
 .github/workflows/ci.yaml | 2 ++
 ci/rustup.sh              | 2 +-
 ci/test_full.sh           | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 44bcde8..1e0517a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -10,6 +10,8 @@ jobs:
       matrix:
         rust: [
           1.31.0, # MSRV
+          1.51.0,
+          1.60.0,
           stable,
           beta,
           nightly,
diff --git a/ci/rustup.sh b/ci/rustup.sh
index fed3e45..18015d2 100755
--- a/ci/rustup.sh
+++ b/ci/rustup.sh
@@ -5,6 +5,6 @@
 set -ex
 
 ci=$(dirname $0)
-for version in 1.31.0 stable beta nightly; do
+for version in 1.31.0 1.51.0 1.60.0 stable beta nightly; do
     rustup run "$version" "$ci/test_full.sh"
 done
diff --git a/ci/test_full.sh b/ci/test_full.sh
index c03cec7..57c5ac0 100755
--- a/ci/test_full.sh
+++ b/ci/test_full.sh
@@ -30,6 +30,12 @@ fi
 FEATURES=()
 echo "Testing supported features: ${FEATURES[*]}"
 
+cargo generate-lockfile
+
+# num-traits 0.2.19 started using dep: features, which requires 1.60 and is
+# otherwise ignored down to 1.51, but we need a manual downgrade before that.
+check_version 1.51 || cargo update -p num-traits --precise 0.2.18
+
 set -x
 
 # test the default

From ce7b81eea0236e6fae94516d14773f9250757fd3 Mon Sep 17 00:00:00 2001
From: Josh Stone <cuviper@gmail.com>
Date: Fri, 3 May 2024 16:59:49 -0700
Subject: [PATCH 2/2] Manual builds aren't needed before `test_full.sh`

---
 .github/workflows/ci.yaml     | 1 -
 .github/workflows/master.yaml | 1 -
 .github/workflows/pr.yaml     | 1 -
 3 files changed, 3 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 1e0517a..9823d24 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -26,7 +26,6 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-      - run: cargo build
       - run: ./ci/test_full.sh
 
   # try a target that doesn't have std at all
diff --git a/.github/workflows/master.yaml b/.github/workflows/master.yaml
index 68c4900..f6487bf 100644
--- a/.github/workflows/master.yaml
+++ b/.github/workflows/master.yaml
@@ -24,5 +24,4 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-      - run: cargo build
       - run: ./ci/test_full.sh
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
index 787f908..4e6aa37 100644
--- a/.github/workflows/pr.yaml
+++ b/.github/workflows/pr.yaml
@@ -20,7 +20,6 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-      - run: cargo build
       - run: ./ci/test_full.sh
 
   fmt: