Merge pull request #65 from cuviper/old-ci

Fix older CI for num-traits 0.2.19
rust-num · May 4, 2024 · 03640c2 · 03640c2
2 parents ede2d2c + ce7b81e
commit 03640c2
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git 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,
@@ -24,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
@@ -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
@@ -20,7 +20,6 @@ jobs:
       - uses: dtolnay/rust-toolchain@master
         with:
           toolchain: ${{ matrix.rust }}
-      - run: cargo build
       - run: ./ci/test_full.sh
 
   fmt:

diff --git 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
@@ -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