Skip to content

Commit

Permalink
Merge pull request #28 from cuviper/old-ci
Browse files Browse the repository at this point in the history
Fix older CI for num-traits 0.2.19
  • Loading branch information
cuviper committed May 4, 2024
2 parents c643db4 + 25d6677 commit a5b1707
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 5 deletions.
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

0 comments on commit a5b1707

Please sign in to comment.