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

Use v2 of the Cargo feature resolver and make CI work with it #1207

Closed
wants to merge 3 commits into from
Closed
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
9 changes: 7 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: CI

env:
CARGO_TERM_COLOR: always
MSRV: 1.56.0
MSRV: 1.56

on:
push:
Expand Down Expand Up @@ -113,6 +113,12 @@ jobs:
command: update
args: -Z minimal-versions
toolchain: nightly
- name: Fix up Cargo.lock
uses: actions-rs/cargo@v1
with:
command: update
args: -p crc32fast --precise 1.1.1
toolchain: nightly
- name: Run tests
uses: actions-rs/cargo@v1
with:
Expand All @@ -121,7 +127,6 @@ jobs:
-p axum
-p axum-extra
-p axum-core
-p internal-minimal-versions
--all-features
--all-targets
--locked
Expand Down
6 changes: 1 addition & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,5 @@ members = [
"axum-core",
"axum-extra",
"axum-macros",

# internal crate used to bump the minimum versions we
# get for some dependencies which otherwise wouldn't build
# with `cargo +nightly update -Z minimal-versions`
"internal-minimal-versions",
]
resolver = "2"
2 changes: 1 addition & 1 deletion axum/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ multer = { version = "2.0.0", optional = true }
serde_json = { version = "1.0", features = ["raw_value"], optional = true }
serde_urlencoded = { version = "0.7", optional = true }
sha-1 = { version = "0.10", optional = true }
tokio-tungstenite = { version = "0.17", optional = true }
tokio-tungstenite = { version = "0.17.2", optional = true }

[dev-dependencies]
anyhow = "1.0"
Expand Down
1 change: 1 addition & 0 deletions examples/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[workspace]
members = ["*"]
exclude = ["target"]
resolver = "2"
16 changes: 0 additions & 16 deletions internal-minimal-versions/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion internal-minimal-versions/src/lib.rs

This file was deleted.