Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix older CI for num-traits 0.2.19 #28

Merged
merged 2 commits into from
May 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,14 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
rust: [1.31.0, stable, beta, nightly]
rust: [
1.31.0, # MSRV
1.51.0,
1.60.0,
stable,
beta,
nightly,
]
steps:
- uses: actions/checkout@v4
- uses: actions/cache@v4
Expand All @@ -19,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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,4 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- run: cargo build
- run: ./ci/test_full.sh
1 change: 0 additions & 1 deletion .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ jobs:
- uses: dtolnay/rust-toolchain@master
with:
toolchain: ${{ matrix.rust }}
- run: cargo build
- run: ./ci/test_full.sh

fmt:
Expand Down
2 changes: 1 addition & 1 deletion ci/rustup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions ci/test_full.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down