Skip to content

Commit

Permalink
build: switch Rust requirement to 1.70
Browse files Browse the repository at this point in the history
More dependencies keep getting released with a 1.70 requirement,
targetting 1.66 is not realistic any more.

Because of actions-rs/toolchain#230, specify the requirement as
"1.70.0" to avoid getting old 1.7.0 instead.

Drop artificial dependency pinning (reverts
ddb06f0).
  • Loading branch information
ydirson committed Oct 2, 2023
1 parent d59f742 commit 45d24c1
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 13 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.66
toolchain: 1.70.0
override: true
- name: Installing dependency packages
run: sudo apt update && sudo apt install -y libxen-dev protobuf-compiler
Expand All @@ -32,7 +32,7 @@ jobs:
- uses: actions/checkout@v3
- uses: actions-rs/toolchain@v1
with:
toolchain: 1.66
toolchain: 1.70.0
override: true
- name: Installing dependency packages
run: sudo apt update && sudo apt install -y libxen-dev protobuf-compiler
Expand Down
12 changes: 1 addition & 11 deletions xcp-metrics-common/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ description = "Library related to xcp-metrics and rrdd"
version.workspace = true
license = "AGPL-3.0-only"
edition = "2021"
rust-version = "1.66"
rust-version = "1.70" # we need only 1.66 but our deps want 1.70

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down Expand Up @@ -43,13 +43,3 @@ test = ["tokio/full"]
[dev-dependencies]
# https://github.com/rust-lang/cargo/issues/2911
xcp-metrics-common = { path = ".", features = ["test"] }

# dependency pins to ensure 1.66 compatibility
# (all are indirect dependencies, blame fast-moving ecosystem)

[dependencies.anstream]
version = "<0.5"
[dependencies.clap_builder]
version = "<4.4"
[dependencies.clap_lex]
version = "<0.5.1"

0 comments on commit 45d24c1

Please sign in to comment.