Skip to content

Commit 03640c2

Browse files
authored
Merge pull request rust-num#65 from cuviper/old-ci
Fix older CI for num-traits 0.2.19
2 parents ede2d2c + ce7b81e commit 03640c2

File tree

5 files changed

+9
-4
lines changed

5 files changed

+9
-4
lines changed

Diff for: .github/workflows/ci.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ jobs:
1010
matrix:
1111
rust: [
1212
1.31.0, # MSRV
13+
1.51.0,
14+
1.60.0,
1315
stable,
1416
beta,
1517
nightly,
@@ -24,7 +26,6 @@ jobs:
2426
- uses: dtolnay/rust-toolchain@master
2527
with:
2628
toolchain: ${{ matrix.rust }}
27-
- run: cargo build
2829
- run: ./ci/test_full.sh
2930

3031
# try a target that doesn't have std at all

Diff for: .github/workflows/master.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -24,5 +24,4 @@ jobs:
2424
- uses: dtolnay/rust-toolchain@master
2525
with:
2626
toolchain: ${{ matrix.rust }}
27-
- run: cargo build
2827
- run: ./ci/test_full.sh

Diff for: .github/workflows/pr.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
- uses: dtolnay/rust-toolchain@master
2121
with:
2222
toolchain: ${{ matrix.rust }}
23-
- run: cargo build
2423
- run: ./ci/test_full.sh
2524

2625
fmt:

Diff for: ci/rustup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,6 @@
55
set -ex
66

77
ci=$(dirname $0)
8-
for version in 1.31.0 stable beta nightly; do
8+
for version in 1.31.0 1.51.0 1.60.0 stable beta nightly; do
99
rustup run "$version" "$ci/test_full.sh"
1010
done

Diff for: ci/test_full.sh

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ fi
3030
FEATURES=()
3131
echo "Testing supported features: ${FEATURES[*]}"
3232

33+
cargo generate-lockfile
34+
35+
# num-traits 0.2.19 started using dep: features, which requires 1.60 and is
36+
# otherwise ignored down to 1.51, but we need a manual downgrade before that.
37+
check_version 1.51 || cargo update -p num-traits --precise 0.2.18
38+
3339
set -x
3440

3541
# test the default

0 commit comments

Comments
 (0)